summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2014-04-27 15:57:51 +0200
committerczaks <marcin@6irc.net>2014-04-27 15:57:51 +0200
commit6685333bd33f3ce259136c4c6ee6ba5c0f4c8fea (patch)
tree401b92ef70fb7b900aa43d7bbe6f4bc5af2f3b4f
parentc483e1258cb5d168812a6e509e982a172f6c36c6 (diff)
don‘t abort upgrade if REBUILD isn‘t supported
-rw-r--r--install.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/install.php b/install.php
index 4a5a54cb..4ad8ab80 100644
--- a/install.php
+++ b/install.php
@@ -527,7 +527,7 @@ if (file_exists($config['has_installed'])) {
query(sprintf('ALTER TABLE ``posts_%s`` ADD `num_files` int(11) DEFAULT 0 AFTER `files`;', $board['uri'])) or error(db_error());
query(sprintf('UPDATE ``posts_%s`` SET `files` = CONCAT(\'[{"file":"\',`filename`,\'", "size":"\',`filesize`,\'", "width":"\',`filewidth`,\'","height":"\',`fileheight`,\'","thumbwidth":"\',`thumbwidth`,\'","thumbheight":"\',`thumbheight`,\'", "file_path":"%s\/src\/\',`filename`,\'","thumb_path":"%s\/thumb\/\',`filename`,\'"}]\') WHERE `file` IS NOT NULL', $board['uri'], $board['uri'], $board['uri'])) or error(db_error());
query(sprintf('ALTER TABLE ``posts_%s`` DROP COLUMN `thumb`, DROP COLUMN `thumbwidth`, DROP COLUMN `thumbheight`, DROP COLUMN `file`, DROP COLUMN `fileheight`, DROP COLUMN `filesize`, DROP COLUMN `filename`', $board['uri'])) or error(db_error());
- query(sprintf('ALTER TABLE ``posts_%s`` REBUILD', $board['uri'])) or error(db_error());
+ query(sprintf('ALTER TABLE ``posts_%s`` REBUILD', $board['uri'])); // or error(db_error()); apparently this didn't work for my mariadb installation, let's just don't quit if it doesn't succeed
}
case false:
// TODO: enhance Tinyboard -> vichan upgrade path.