Skip to content
Browse files

#460: Use \"ENGINE\" instead of deprecated \"TYPE\" when creating dat…

…abase tables in MySQL.
  • Loading branch information...
1 parent 8b46826 commit 19e6f6221afd7ec18f61a3304a39f81cc33efa03 @franzliedke franzliedke committed
Showing with 25 additions and 25 deletions.
  1. +25 −25 upload/install.php
View
50 upload/install.php
@@ -293,14 +293,14 @@ function error($message, $file = false, $line = false, $db_error = false)
exit;
}
-
-
- //
- // Calls htmlspecialchars with a few options already set
- //
- function pun_htmlspecialchars($str)
- {
- return htmlspecialchars($str, ENT_QUOTES, 'UTF-8');
+
+
+ //
+ // Calls htmlspecialchars with a few options already set
+ //
+ function pun_htmlspecialchars($str)
+ {
+ return htmlspecialchars($str, ENT_QUOTES, 'UTF-8');
}
@@ -407,7 +407,7 @@ function pun_htmlspecialchars($str)
message VARCHAR(255),
expire INT(10) UNSIGNED,
PRIMARY KEY (id)
- ) TYPE=MyISAM;";
+ ) ENGINE=MyISAM;";
break;
case 'pgsql':
@@ -452,7 +452,7 @@ function pun_htmlspecialchars($str)
cat_name VARCHAR(80) NOT NULL DEFAULT 'New Category',
disp_position INT(10) NOT NULL DEFAULT 0,
PRIMARY KEY (id)
- ) TYPE=MyISAM;";
+ ) ENGINE=MyISAM;";
break;
case 'pgsql':
@@ -487,7 +487,7 @@ function pun_htmlspecialchars($str)
search_for VARCHAR(60) NOT NULL DEFAULT '',
replace_with VARCHAR(60) NOT NULL DEFAULT '',
PRIMARY KEY (id)
- ) TYPE=MyISAM;";
+ ) ENGINE=MyISAM;";
break;
case 'pgsql':
@@ -521,7 +521,7 @@ function pun_htmlspecialchars($str)
conf_name VARCHAR(255) NOT NULL DEFAULT '',
conf_value TEXT,
PRIMARY KEY (conf_name)
- ) TYPE=MyISAM;";
+ ) ENGINE=MyISAM;";
break;
case 'pgsql':
@@ -556,7 +556,7 @@ function pun_htmlspecialchars($str)
post_replies TINYINT(1) NOT NULL DEFAULT 1,
post_topics TINYINT(1) NOT NULL DEFAULT 1,
PRIMARY KEY (group_id, forum_id)
- ) TYPE=MyISAM;";
+ ) ENGINE=MyISAM;";
break;
case 'pgsql':
@@ -605,7 +605,7 @@ function pun_htmlspecialchars($str)
disp_position INT(10) NOT NULL DEFAULT 0,
cat_id INT(10) UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (id)
- ) TYPE=MyISAM;";
+ ) ENGINE=MyISAM;";
break;
case 'pgsql':
@@ -673,7 +673,7 @@ function pun_htmlspecialchars($str)
g_post_flood SMALLINT(6) NOT NULL DEFAULT 30,
g_search_flood SMALLINT(6) NOT NULL DEFAULT 30,
PRIMARY KEY (g_id)
- ) TYPE=MyISAM;";
+ ) ENGINE=MyISAM;";
break;
case 'pgsql':
@@ -734,7 +734,7 @@ function pun_htmlspecialchars($str)
ident VARCHAR(200) NOT NULL DEFAULT '',
logged INT(10) UNSIGNED NOT NULL DEFAULT 0,
idle TINYINT(1) NOT NULL DEFAULT 0
- ) TYPE=HEAP;";
+ ) ENGINE=HEAP;";
break;
case 'pgsql':
@@ -777,7 +777,7 @@ function pun_htmlspecialchars($str)
edited_by VARCHAR(200),
topic_id INT(10) UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (id)
- ) TYPE=MyISAM;";
+ ) ENGINE=MyISAM;";
break;
case 'pgsql':
@@ -828,7 +828,7 @@ function pun_htmlspecialchars($str)
rank VARCHAR(50) NOT NULL DEFAULT '',
min_posts MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (id)
- ) TYPE=MyISAM;";
+ ) ENGINE=MyISAM;";
break;
case 'pgsql':
@@ -869,7 +869,7 @@ function pun_htmlspecialchars($str)
zapped INT(10) UNSIGNED,
zapped_by INT(10) UNSIGNED,
PRIMARY KEY (id)
- ) TYPE=MyISAM;";
+ ) ENGINE=MyISAM;";
break;
case 'pgsql':
@@ -916,7 +916,7 @@ function pun_htmlspecialchars($str)
ident VARCHAR(200) NOT NULL DEFAULT '',
search_data TEXT,
PRIMARY KEY (id)
- ) TYPE=MyISAM;";
+ ) ENGINE=MyISAM;";
break;
case 'pgsql':
@@ -950,7 +950,7 @@ function pun_htmlspecialchars($str)
post_id INT(10) UNSIGNED NOT NULL DEFAULT 0,
word_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0,
subject_match TINYINT(1) NOT NULL DEFAULT 0
- ) TYPE=MyISAM;";
+ ) ENGINE=MyISAM;";
break;
case 'pgsql':
@@ -983,7 +983,7 @@ function pun_htmlspecialchars($str)
word VARCHAR(20) BINARY NOT NULL DEFAULT '',
PRIMARY KEY (word),
KEY ".$db_prefix."search_words_id_idx (id)
- ) TYPE=MyISAM;";
+ ) ENGINE=MyISAM;";
break;
case 'pgsql':
@@ -1016,7 +1016,7 @@ function pun_htmlspecialchars($str)
user_id INT(10) UNSIGNED NOT NULL DEFAULT 0,
topic_id INT(10) UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (user_id, topic_id)
- ) TYPE=MyISAM;";
+ ) ENGINE=MyISAM;";
break;
case 'pgsql':
@@ -1059,7 +1059,7 @@ function pun_htmlspecialchars($str)
moved_to INT(10) UNSIGNED,
forum_id INT(10) UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (id)
- ) TYPE=MyISAM;";
+ ) ENGINE=MyISAM;";
break;
case 'pgsql':
@@ -1148,7 +1148,7 @@ function pun_htmlspecialchars($str)
activate_string VARCHAR(50),
activate_key VARCHAR(8),
PRIMARY KEY (id)
- ) TYPE=MyISAM;";
+ ) ENGINE=MyISAM;";
break;
case 'pgsql':

0 comments on commit 19e6f62

Please sign in to comment.
Something went wrong with that request. Please try again.