http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72841
Revision: 72841
Author: ialex
Date: 2010-09-12 07:58:00 +0000 (Sun, 12 Sep 2010)
Log Message:
-----------
Add `watchlist`.`wl_notificationtimestamp` through addField() instead of
duplicating the code in do_watchlist_update()
Modified Paths:
--------------
trunk/phase3/includes/installer/MysqlUpdater.php
trunk/phase3/maintenance/updaters.inc
Modified: trunk/phase3/includes/installer/MysqlUpdater.php
===================================================================
--- trunk/phase3/includes/installer/MysqlUpdater.php 2010-09-12 07:24:32 UTC
(rev 72840)
+++ trunk/phase3/includes/installer/MysqlUpdater.php 2010-09-12 07:58:00 UTC
(rev 72841)
@@ -39,6 +39,7 @@
array( 'addField', 'recentchanges', 'rc_patrolled',
'patch-rc-patrol.sql' ),
array( 'addTable', 'logging',
'patch-logging.sql' ),
array( 'addField', 'user', 'user_token',
'patch-user_token.sql' ),
+ array( 'addField', 'watchlist',
'wl_notificationtimestamp', 'patch-email-notification.sql' ),
array( 'do_watchlist_update' ),
array( 'dropField', 'user',
'user_emailauthenticationtimestamp', 'patch-email-authentication.sql' ),
Modified: trunk/phase3/maintenance/updaters.inc
===================================================================
--- trunk/phase3/maintenance/updaters.inc 2010-09-12 07:24:32 UTC (rev
72840)
+++ trunk/phase3/maintenance/updaters.inc 2010-09-12 07:58:00 UTC (rev
72841)
@@ -56,20 +56,11 @@
function do_watchlist_update() {
$dbw = wfGetDB( DB_MASTER );
- if ( $dbw->fieldExists( 'watchlist', 'wl_notificationtimestamp' ) ) {
- wfOut( "...the watchlist table is already set up for email
notification.\n" );
- } else {
- wfOut( "Adding wl_notificationtimestamp field for email
notification management." );
- /* ALTER TABLE watchlist ADD (wl_notificationtimestamp
varchar(14) binary NOT NULL default '0'); */
- $dbw->sourceFile( archive( 'patch-email-notification.sql' ) );
- wfOut( "ok\n" );
- }
# Check if we need to add talk page rows to the watchlist
$talk = $dbw->selectField( 'watchlist', 'count(*)', 'wl_namespace & 1',
__METHOD__ );
$nontalk = $dbw->selectField( 'watchlist', 'count(*)', 'NOT
(wl_namespace & 1)', __METHOD__ );
if ( $talk != $nontalk ) {
wfOut( "Adding missing watchlist talk page rows... " );
- flush();
$dbw->insertSelect( 'watchlist', 'watchlist',
array(
@@ -278,7 +269,6 @@
wfOut( "Converting links and brokenlinks tables to pagelinks...
" );
$dbw->sourceFile( archive( 'patch-pagelinks.sql' ) );
wfOut( "ok\n" );
- flush();
global $wgCanonicalNamespaceNames;
foreach ( $wgCanonicalNamespaceNames as $ns => $name ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
