diff options
| author | czaks <marcin@6irc.net> | 2013-11-11 21:54:35 +0100 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-11-11 21:54:35 +0100 |
| commit | f5657caf24753ed7c25d56659ae8dfe79d48b99a (patch) | |
| tree | 989f1149070194f18f6250c851159dda813151fe /install.php | |
| parent | 0a58973631626879abeea4956b33cc2b56dea453 (diff) | |
| parent | 9fb63b053fbb552a2a8bbde1e230a8b73296fb6d (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5
Conflicts:
inc/config.php
install.php
post.php
stylesheets/style.css
Diffstat (limited to 'install.php')
| -rw-r--r-- | install.php | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/install.php b/install.php index 51d5f133..fed4a77f 100644 --- a/install.php +++ b/install.php @@ -1,7 +1,7 @@ <?php // Installation/upgrade file -define('VERSION', 'v0.9.6-dev-21 + <a href="https://int.vichan.net/devel/">vichan-devel-4.4.90</a>'); +define('VERSION', 'v0.9.6-dev-22 + <a href="https://int.vichan.net/devel/">vichan-devel-4.4.91</a>'); require 'inc/functions.php'; @@ -13,7 +13,7 @@ $page = array( 'nojavascript' => true ); -// this breaks the dispaly of licenses if enabled +// this breaks the display of licenses if enabled $config['minify_html'] = false; if (file_exists($config['has_installed'])) { @@ -428,7 +428,7 @@ if (file_exists($config['has_installed'])) { query("UPDATE ``mods`` SET `type` = 30 WHERE `type` = 2") or error(db_error()); query("ALTER TABLE ``mods`` CHANGE `type` `type` smallint(1) NOT NULL") or error(db_error()); case 'v0.9.6-dev-20': - query("CREATE TABLE IF NOT EXISTS `bans_new_temp` ( + __query("CREATE TABLE IF NOT EXISTS `bans_new_temp` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `ipstart` varbinary(16) NOT NULL, `ipend` varbinary(16) DEFAULT NULL, @@ -487,7 +487,18 @@ if (file_exists($config['has_installed'])) { query("DROP TABLE ``bans``") or error(db_error()); // Replace with new table query("RENAME TABLE ``bans_new_temp`` TO ``bans``") or error(db_error()); - case 'v0.9.6-dev-21': + case 'v0.9.6-dev-21': + case 'v0.9.6-dev-21 + <a href="https://int.vichan.net/devel/">vichan-devel-4.4.90</a>': + __query("CREATE TABLE IF NOT EXISTS ``ban_appeals`` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `ban_id` int(10) unsigned NOT NULL, + `time` int(10) unsigned NOT NULL, + `message` text NOT NULL, + `denied` tinyint(1) NOT NULL, + PRIMARY KEY (`id`), + KEY `ban_id` (`ban_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT=1 ;") or error(db_error()); + case 'v0.9.6-dev-22': case false: // Update version number file_write($config['has_installed'], VERSION); |