| Property changes on: branches/usability/phase3/maintenance/deleteSelfExternals.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1 | 1 | - /branches/REL1_15/phase3/maintenance/deleteSelfExternals.php:51646 |
| /trunk/phase3/maintenance/deleteSelfExternals.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626 |
| 2 | 2 | + /branches/REL1_15/phase3/maintenance/deleteSelfExternals.php:51646 |
| /trunk/phase3/maintenance/deleteSelfExternals.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,57129-57130 |
| Property changes on: branches/usability/phase3/maintenance/cleanupTable.inc |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 3 | 3 | - /branches/REL1_15/phase3/maintenance/cleanupTable.inc:51646 |
| /branches/wmf-deployment/maintenance/cleanupTable.inc:56715 |
| 4 | 4 | + /branches/REL1_15/phase3/maintenance/cleanupTable.inc:51646 |
| /branches/wmf-deployment/maintenance/cleanupTable.inc:56715 |
| /trunk/phase3/maintenance/cleanupTable.inc:57129-57130 |
| Property changes on: branches/usability/phase3/includes/json/Services_JSON.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 5 | 5 | - /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646 |
| /branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381 |
| 6 | 6 | + /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646 |
| /branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381 |
| /trunk/phase3/includes/json/Services_JSON.php:57129-57130 |
| Property changes on: branches/usability/phase3/includes/HistoryPage.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 7 | 7 | - /branches/REL1_15/phase3/includes/PageHistory.php:51646 |
| 8 | 8 | + /branches/REL1_15/phase3/includes/PageHistory.php:51646 |
| /trunk/phase3/includes/HistoryPage.php:57129-57130 |
| Property changes on: branches/usability/phase3/includes/ConfEditor.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 9 | 9 | - |
| 10 | 10 | + /trunk/phase3/includes/ConfEditor.php:57129-57130 |
| Index: branches/usability/phase3/includes/specials/SpecialWatchlist.php |
| — | — | @@ -25,7 +25,7 @@ |
| 26 | 26 | global $wgServer, $wgScriptPath, $wgFeedClasses; |
| 27 | 27 | $apiParams = array( 'action' => 'feedwatchlist', 'allrev' => 'allrev', |
| 28 | 28 | 'wlowner' => $wgUser->getName(), 'wltoken' => $wlToken ); |
| 29 | | - $feedTemplate = $wgServer . $wgScriptPath . '/api.php?'; |
| | 29 | + $feedTemplate = wfScript('api').'?'; |
| 30 | 30 | |
| 31 | 31 | foreach( $wgFeedClasses as $format => $class ) { |
| 32 | 32 | $theseParams = $apiParams + array( 'feedformat' => $format ); |
| Property changes on: branches/usability/phase3/includes |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 33 | 33 | - /branches/REL1_15/phase3/includes:51646 |
| /branches/wmf-deployment/includes:53381 |
| 34 | 34 | + /branches/REL1_15/phase3/includes:51646 |
| /branches/wmf-deployment/includes:53381 |
| /trunk/phase3/includes:57129-57130 |
| Property changes on: branches/usability/phase3/js2/mwEmbed/jquery/jquery.ui |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 35 | 35 | - /branches/REL1_15/phase3/js2/mwEmbed/jquery/jquery.ui-1.7.1:51646 |
| 36 | 36 | + /branches/REL1_15/phase3/js2/mwEmbed/jquery/jquery.ui-1.7.1:51646 |
| /trunk/phase3/js2/mwEmbed/jquery/jquery.ui:57129-57130 |
| Property changes on: branches/usability/phase3 |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 37 | 37 | - /branches/REL1_15/phase3:51646 |
| 38 | 38 | + /branches/REL1_15/phase3:51646 |
| /trunk/phase3:57129-57130 |