| Index: trunk/phase3/maintenance/updaters.inc |
| — | — | @@ -56,20 +56,11 @@ |
| 57 | 57 | |
| 58 | 58 | function do_watchlist_update() { |
| 59 | 59 | $dbw = wfGetDB( DB_MASTER ); |
| 60 | | - if ( $dbw->fieldExists( 'watchlist', 'wl_notificationtimestamp' ) ) { |
| 61 | | - wfOut( "...the watchlist table is already set up for email notification.\n" ); |
| 62 | | - } else { |
| 63 | | - wfOut( "Adding wl_notificationtimestamp field for email notification management." ); |
| 64 | | - /* ALTER TABLE watchlist ADD (wl_notificationtimestamp varchar(14) binary NOT NULL default '0'); */ |
| 65 | | - $dbw->sourceFile( archive( 'patch-email-notification.sql' ) ); |
| 66 | | - wfOut( "ok\n" ); |
| 67 | | - } |
| 68 | 60 | # Check if we need to add talk page rows to the watchlist |
| 69 | 61 | $talk = $dbw->selectField( 'watchlist', 'count(*)', 'wl_namespace & 1', __METHOD__ ); |
| 70 | 62 | $nontalk = $dbw->selectField( 'watchlist', 'count(*)', 'NOT (wl_namespace & 1)', __METHOD__ ); |
| 71 | 63 | if ( $talk != $nontalk ) { |
| 72 | 64 | wfOut( "Adding missing watchlist talk page rows... " ); |
| 73 | | - flush(); |
| 74 | 65 | |
| 75 | 66 | $dbw->insertSelect( 'watchlist', 'watchlist', |
| 76 | 67 | array( |
| — | — | @@ -278,7 +269,6 @@ |
| 279 | 270 | wfOut( "Converting links and brokenlinks tables to pagelinks... " ); |
| 280 | 271 | $dbw->sourceFile( archive( 'patch-pagelinks.sql' ) ); |
| 281 | 272 | wfOut( "ok\n" ); |
| 282 | | - flush(); |
| 283 | 273 | |
| 284 | 274 | global $wgCanonicalNamespaceNames; |
| 285 | 275 | foreach ( $wgCanonicalNamespaceNames as $ns => $name ) { |
| Index: trunk/phase3/includes/installer/MysqlUpdater.php |
| — | — | @@ -39,6 +39,7 @@ |
| 40 | 40 | array( 'addField', 'recentchanges', 'rc_patrolled', 'patch-rc-patrol.sql' ), |
| 41 | 41 | array( 'addTable', 'logging', 'patch-logging.sql' ), |
| 42 | 42 | array( 'addField', 'user', 'user_token', 'patch-user_token.sql' ), |
| | 43 | + array( 'addField', 'watchlist', 'wl_notificationtimestamp', 'patch-email-notification.sql' ), |
| 43 | 44 | array( 'do_watchlist_update' ), |
| 44 | 45 | array( 'dropField', 'user', 'user_emailauthenticationtimestamp', 'patch-email-authentication.sql' ), |
| 45 | 46 | |