http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65314
Revision: 65314
Author: reedy
Date: 2010-04-20 14:06:00 +0000 (Tue, 20 Apr 2010)
Log Message:
-----------
querypage-work2: Merge r49528 from querypage-work
Modified Paths:
--------------
branches/querypage-work2/phase3/includes/specials/SpecialBlockip.php
branches/querypage-work2/phase3/includes/specials/SpecialUndelete.php
Property Changed:
----------------
branches/querypage-work2/
branches/querypage-work2/phase3/
branches/querypage-work2/phase3/includes/
branches/querypage-work2/phase3/includes/ChangesList.php
branches/querypage-work2/phase3/includes/ConfEditor.php
branches/querypage-work2/phase3/includes/OutputPage.php
branches/querypage-work2/phase3/includes/api/
branches/querypage-work2/phase3/includes/specials/
branches/querypage-work2/phase3/maintenance/cleanupTable.inc
branches/querypage-work2/phase3/skins/common/jquery.js
branches/querypage-work2/phase3/skins/common/jquery.min.js
Property changes on: branches/querypage-work2
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/querypage-work:49084
+ /branches/querypage-work:49084,49528
Property changes on: branches/querypage-work2/phase3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3:51646
/branches/querypage-work/phase3:49084
/branches/sqlite:58211-58321
+ /branches/REL1_15/phase3:51646
/branches/querypage-work/phase3:49084,49528
/branches/sqlite:58211-58321
Property changes on: branches/querypage-work2/phase3/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes:51646
/branches/querypage-work/phase3/includes:49084
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
+ /branches/REL1_15/phase3/includes:51646
/branches/querypage-work/phase3/includes:49084,49528
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
Property changes on: branches/querypage-work2/phase3/includes/ChangesList.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/querypage-work/phase3/includes/ChangesList.php:49084
/branches/wmf-deployment/includes/ChangesList.php:53381,57589
+ /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/querypage-work/phase3/includes/ChangesList.php:49084,49528
/branches/wmf-deployment/includes/ChangesList.php:53381,57589
Property changes on: branches/querypage-work2/phase3/includes/ConfEditor.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/querypage-work/phase3/includes/ConfEditor.php:49084
+ /branches/querypage-work/phase3/includes/ConfEditor.php:49084,49528
Property changes on: branches/querypage-work2/phase3/includes/OutputPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/querypage-work/phase3/includes/OutputPage.php:49084
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
+ /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/querypage-work/phase3/includes/OutputPage.php:49084,49528
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
Property changes on: branches/querypage-work2/phase3/includes/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/api:51646
/branches/REL1_16/phase3/includes/api:63621-63636
/branches/querypage-work/phase3/includes/api:49084
/branches/sqlite/includes/api:58211-58321
/branches/wmf-deployment/includes/api:53381,59952
+ /branches/REL1_15/phase3/includes/api:51646
/branches/REL1_16/phase3/includes/api:63621-63636
/branches/querypage-work/phase3/includes/api:49084,49528
/branches/sqlite/includes/api:58211-58321
/branches/wmf-deployment/includes/api:53381,59952
Property changes on: branches/querypage-work2/phase3/includes/specials
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/specials:51646
/branches/querypage-work/phase3/includes/specials:49084
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
+ /branches/REL1_15/phase3/includes/specials:51646
/branches/querypage-work/phase3/includes/specials:49084,49528
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
Modified: branches/querypage-work2/phase3/includes/specials/SpecialBlockip.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialBlockip.php
2010-04-20 13:58:21 UTC (rev 65313)
+++ branches/querypage-work2/phase3/includes/specials/SpecialBlockip.php
2010-04-20 14:06:00 UTC (rev 65314)
@@ -618,6 +618,8 @@
array( 'rc_user_text' => $name ), __METHOD__ );
$dbw->update( 'recentchanges', array( "rc_deleted = rc_deleted
$op $delAction" ),
array( 'rc_namespace' => NS_USER, 'rc_title' =>
$userDbKey, 'rc_logid > 0' ), __METHOD__ );
+ $dbw->update( 'recentchanges', array("rc_deleted = rc_deleted
$op $delAction"),
+ array('rc_namespace' => NS_USER, 'rc_title' =>
$userDbKey, 'rc_logid > 0'), __METHOD__ );
# Hide name from live images
$dbw->update( 'oldimage', array( "oi_deleted = oi_deleted $op
$delUser" ),
array( 'oi_user_text' => $name ), __METHOD__ );
@@ -884,4 +886,4 @@
}
return $safeUsers;
}
-}
+}
\ No newline at end of file
Modified: branches/querypage-work2/phase3/includes/specials/SpecialUndelete.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialUndelete.php
2010-04-20 13:58:21 UTC (rev 65313)
+++ branches/querypage-work2/phase3/includes/specials/SpecialUndelete.php
2010-04-20 14:06:00 UTC (rev 65314)
@@ -1397,4 +1397,4 @@
}
return false;
}
-}
+}
\ No newline at end of file
Property changes on:
branches/querypage-work2/phase3/maintenance/cleanupTable.inc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/cleanupTable.inc:51646
/branches/querypage-work/phase3/maintenance/cleanupTable.inc:49084
/branches/wmf-deployment/maintenance/cleanupTable.inc:56715
+ /branches/REL1_15/phase3/maintenance/cleanupTable.inc:51646
/branches/querypage-work/phase3/maintenance/cleanupTable.inc:49084,49528
/branches/wmf-deployment/maintenance/cleanupTable.inc:56715
Property changes on: branches/querypage-work2/phase3/skins/common/jquery.js
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/querypage-work/phase3/skins/common/jquery.js:49084
+ /branches/querypage-work/phase3/skins/common/jquery.js:49084,49528
Property changes on: branches/querypage-work2/phase3/skins/common/jquery.min.js
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/querypage-work/phase3/skins/common/jquery.min.js:49084
+ /branches/querypage-work/phase3/skins/common/jquery.min.js:49084,49528
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
