| Index: branches/wmf/1.18wmf1/maintenance/ums_conversation.sql |
| — | — | @@ -3,7 +3,7 @@ |
| 4 | 4 | ALTER TABLE /*_*/user_message_state ADD COLUMN ums_conversation int(8) unsigned NOT NULL DEFAULT 0; |
| 5 | 5 | |
| 6 | 6 | CREATE INDEX /*i*/ums_user_conversation ON /*_*/user_message_state (ums_user,ums_conversation); |
| 7 | | -DROP INDEX /*i*/ums_user ON /*_*/user_message_state; |
| | 7 | +-- DROP INDEX /*i*/ums_user ON /*_*/user_message_state; |
| 8 | 8 | |
| 9 | 9 | UPDATE /*_*/user_message_state, /*_*/thread |
| 10 | 10 | SET /*_*/user_message_state.ums_conversation = if(/*_*/thread.thread_ancestor, /*_*/thread.thread_ancestor, /*_*/thread.thread_id) |
| Index: branches/wmf/1.18wmf1/maintenance/upgrade-1.18wmf1-2.php |
| — | — | @@ -1,6 +1,7 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | 4 | require( dirname( __FILE__ ) . '/commandLine.inc' ); |
| | 5 | +require( dirname( __FILE__ ) . '/../../wmf-config/InitialiseSettings.php' ); |
| 5 | 6 | |
| 6 | 7 | doAllSchemaChanges(); |
| 7 | 8 | |
| — | — | @@ -55,21 +56,22 @@ |
| 56 | 57 | } |
| 57 | 58 | |
| 58 | 59 | function upgradeWiki( $db ) { |
| | 60 | + global $wgConf; |
| 59 | 61 | $wiki = $db->getDBname(); |
| 60 | 62 | $server = $db->getServer(); |
| 61 | 63 | |
| 62 | 64 | $upgradeLogRow = $db->selectRow( 'updatelog', |
| 63 | 65 | 'ul_key', |
| 64 | | - array( 'ul_key' => '1.18wmf1-2' ), |
| | 66 | + array( 'ul_key' => '1.18wmf1-lt' ), |
| 65 | 67 | __FUNCTION__ ); |
| 66 | 68 | if ( $upgradeLogRow ) { |
| 67 | 69 | echo $db->getDBname() . ": already done\n"; |
| 68 | 70 | return; |
| 69 | | - } |
| | 71 | + } |
| 70 | 72 | |
| 71 | | - echo "$server $wiki 1.18wmf1-2"; |
| | 73 | + echo "$server $wiki 1.18wmf1-lt"; |
| 72 | 74 | |
| 73 | | - if ( $wgConf->get( 'wmgUseLiquidThreads', $wiki ) ) { |
| | 75 | + if ( $wgConf->get( 'wmgUseLiquidThreads', $wiki ) && $wiki != "test2wiki") { |
| 74 | 76 | echo " liquidthreads"; |
| 75 | 77 | sourceUpgradeFile( $db, dirname( __FILE__ ) .'/ums_conversation.sql' ); |
| 76 | 78 | } else { |
| — | — | @@ -77,9 +79,9 @@ |
| 78 | 80 | } |
| 79 | 81 | |
| 80 | 82 | $db->insert( 'updatelog', |
| 81 | | - array( 'ul_key' => '1.18wmf1-2' ), |
| | 83 | + array( 'ul_key' => '1.18wmf1-lt' ), |
| 82 | 84 | __FUNCTION__ ); |
| 83 | | - echo " ok\n"; |
| | 85 | + echo " ok\n"; |
| 84 | 86 | |
| 85 | 87 | } |
| 86 | 88 | |