diff options
| author | zottel <github@zottel.net> | 2012-06-05 08:20:41 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-06-05 08:20:41 +0200 |
| commit | ef6446288ba4b7590cbb770cdf3c84524f96fd34 (patch) | |
| tree | e3143678da646c7d237b1bb3820202fbd93da7ea /update.php | |
| parent | 70c4ab68754941749a5e89434d6db19f6bba1e16 (diff) | |
| parent | b13c6ea9adde898d499fb70134fa5c99d324031a (diff) | |
| download | volse-hubzilla-ef6446288ba4b7590cbb770cdf3c84524f96fd34.tar.gz volse-hubzilla-ef6446288ba4b7590cbb770cdf3c84524f96fd34.tar.bz2 volse-hubzilla-ef6446288ba4b7590cbb770cdf3c84524f96fd34.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'update.php')
| -rw-r--r-- | update.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/update.php b/update.php index 1b2098e6e..35a6771b0 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1147 ); +define( 'UPDATE_VERSION' , 1148 ); /** * @@ -1137,8 +1137,8 @@ INDEX ( `username` ) } function update_1133() { -q("ALTER TABLE `user` ADD `unkmail` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocktags` , ADD INDEX ( `unkmail` ) ");
-q("ALTER TABLE `user` ADD `cntunkmail` INT NOT NULL DEFAULT '10' AFTER `unkmail` , ADD INDEX ( `cntunkmail` ) ");
+q("ALTER TABLE `user` ADD `unkmail` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocktags` , ADD INDEX ( `unkmail` ) "); +q("ALTER TABLE `user` ADD `cntunkmail` INT NOT NULL DEFAULT '10' AFTER `unkmail` , ADD INDEX ( `cntunkmail` ) "); q("ALTER TABLE `mail` ADD `unknown` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `replied` , ADD INDEX ( `unknown` ) "); } @@ -1274,4 +1274,12 @@ function update_1146() { return UPDATE_SUCCESS ; } +function update_1147() { + $r1 = q("ALTER TABLE `sign` ALTER `iid` SET DEFAULT '0'"); + $r2 = q("ALTER TABLE `sign` ADD `retract_iid` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `iid`"); + $r3 = q("ALTER TABLE `sign` ADD INDEX ( `retract_iid` )"); + if((! $r1) || (! $r2) || (! $r3)) + return UPDATE_FAILED ; + return UPDATE_SUCCESS ; +} |