| Property changes on: branches/querypage-work2/phase3/maintenance/cleanupTable.inc |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1 | 1 | - /branches/REL1_15/phase3/maintenance/cleanupTable.inc:51646 |
| /branches/querypage-work/phase3/maintenance/cleanupTable.inc:49084,49528,49599 |
| /branches/wmf-deployment/maintenance/cleanupTable.inc:56715 |
| 2 | 2 | + /branches/REL1_15/phase3/maintenance/cleanupTable.inc:51646 |
| /branches/querypage-work/phase3/maintenance/cleanupTable.inc:49084,49599 |
| /branches/wmf-deployment/maintenance/cleanupTable.inc:56715 |
| Property changes on: branches/querypage-work2/phase3/skins/common/jquery.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 3 | 3 | - /branches/querypage-work/phase3/skins/common/jquery.js:49084,49528,49599 |
| 4 | 4 | + /branches/querypage-work/phase3/skins/common/jquery.js:49084,49599 |
| Property changes on: branches/querypage-work2/phase3/skins/common/jquery.min.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 5 | 5 | - /branches/querypage-work/phase3/skins/common/jquery.min.js:49084,49528,49599 |
| 6 | 6 | + /branches/querypage-work/phase3/skins/common/jquery.min.js:49084,49599 |
| Property changes on: branches/querypage-work2/phase3/includes/OutputPage.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 7 | 7 | - /branches/REL1_15/phase3/includes/OutputPage.php:51646 |
| /branches/querypage-work/phase3/includes/OutputPage.php:49084,49528,49599 |
| /branches/wmf-deployment/includes/OutputPage.php:53381,57468 |
| 8 | 8 | + /branches/REL1_15/phase3/includes/OutputPage.php:51646 |
| /branches/querypage-work/phase3/includes/OutputPage.php:49084,49599 |
| /branches/wmf-deployment/includes/OutputPage.php:53381,57468 |
| Property changes on: branches/querypage-work2/phase3/includes/api |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 9 | 9 | - /branches/REL1_15/phase3/includes/api:51646 |
| /branches/REL1_16/phase3/includes/api:63621-63636 |
| /branches/querypage-work/phase3/includes/api:49084,49528,49599 |
| /branches/sqlite/includes/api:58211-58321 |
| /branches/wmf-deployment/includes/api:53381,59952 |
| 10 | 10 | + /branches/REL1_15/phase3/includes/api:51646 |
| /branches/REL1_16/phase3/includes/api:63621-63636 |
| /branches/querypage-work/phase3/includes/api:49084,49599 |
| /branches/sqlite/includes/api:58211-58321 |
| /branches/wmf-deployment/includes/api:53381,59952 |
| Property changes on: branches/querypage-work2/phase3/includes/ChangesList.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 11 | 11 | - /branches/REL1_15/phase3/includes/ChangesList.php:51646 |
| /branches/querypage-work/phase3/includes/ChangesList.php:49084,49528,49599 |
| /branches/wmf-deployment/includes/ChangesList.php:53381,57589 |
| 12 | 12 | + /branches/REL1_15/phase3/includes/ChangesList.php:51646 |
| /branches/querypage-work/phase3/includes/ChangesList.php:49084,49599 |
| /branches/wmf-deployment/includes/ChangesList.php:53381,57589 |
| Property changes on: branches/querypage-work2/phase3/includes/ConfEditor.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 13 | 13 | - /branches/querypage-work/phase3/includes/ConfEditor.php:49084,49528,49599 |
| 14 | 14 | + /branches/querypage-work/phase3/includes/ConfEditor.php:49084,49599 |
| Index: branches/querypage-work2/phase3/includes/specials/SpecialUndelete.php |
| — | — | @@ -1397,4 +1397,4 @@ |
| 1398 | 1398 | } |
| 1399 | 1399 | return false; |
| 1400 | 1400 | } |
| 1401 | | -} |
| \ No newline at end of file |
| | 1401 | +} |
| Index: branches/querypage-work2/phase3/includes/specials/SpecialBlockip.php |
| — | — | @@ -618,8 +618,6 @@ |
| 619 | 619 | array( 'rc_user_text' => $name ), __METHOD__ ); |
| 620 | 620 | $dbw->update( 'recentchanges', array( "rc_deleted = rc_deleted $op $delAction" ), |
| 621 | 621 | array( 'rc_namespace' => NS_USER, 'rc_title' => $userDbKey, 'rc_logid > 0' ), __METHOD__ ); |
| 622 | | - $dbw->update( 'recentchanges', array("rc_deleted = rc_deleted $op $delAction"), |
| 623 | | - array('rc_namespace' => NS_USER, 'rc_title' => $userDbKey, 'rc_logid > 0'), __METHOD__ ); |
| 624 | 622 | # Hide name from live images |
| 625 | 623 | $dbw->update( 'oldimage', array( "oi_deleted = oi_deleted $op $delUser" ), |
| 626 | 624 | array( 'oi_user_text' => $name ), __METHOD__ ); |
| — | — | @@ -886,4 +884,4 @@ |
| 887 | 885 | } |
| 888 | 886 | return $safeUsers; |
| 889 | 887 | } |
| 890 | | -} |
| \ No newline at end of file |
| | 888 | +} |
| Property changes on: branches/querypage-work2/phase3/includes/specials |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 891 | 889 | - /branches/REL1_15/phase3/includes/specials:51646 |
| /branches/querypage-work/phase3/includes/specials:49084,49528,49599 |
| /branches/sqlite/includes/specials:58211-58321 |
| /branches/wmf-deployment/includes/specials:53381,56967 |
| 892 | 890 | + /branches/REL1_15/phase3/includes/specials:51646 |
| /branches/querypage-work/phase3/includes/specials:49084,49599 |
| /branches/sqlite/includes/specials:58211-58321 |
| /branches/wmf-deployment/includes/specials:53381,56967 |
| Property changes on: branches/querypage-work2/phase3/includes |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 893 | 891 | - /branches/REL1_15/phase3/includes:51646 |
| /branches/querypage-work/phase3/includes:49084,49528,49599 |
| /branches/sqlite/includes:58211-58321 |
| /branches/wmf-deployment/includes:53381 |
| 894 | 892 | + /branches/REL1_15/phase3/includes:51646 |
| /branches/querypage-work/phase3/includes:49084,49599 |
| /branches/sqlite/includes:58211-58321 |
| /branches/wmf-deployment/includes:53381 |
| Property changes on: branches/querypage-work2/phase3 |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 895 | 893 | - /branches/REL1_15/phase3:51646 |
| /branches/querypage-work/phase3:49084,49528,49599 |
| /branches/sqlite:58211-58321 |
| 896 | 894 | + /branches/REL1_15/phase3:51646 |
| /branches/querypage-work/phase3:49084,49599 |
| /branches/sqlite:58211-58321 |
| Property changes on: branches/querypage-work2 |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 897 | 895 | - /branches/querypage-work:49084,49528,49599 |
| 898 | 896 | + /branches/querypage-work:49084,49599 |