| 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,49599,49631,49951,50105,50378,50436-50437 |
| /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,49631,49951,50105,50378,50436-50437,50460 |
| /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,49599,49631,49951,50105,50378,50436-50437 |
| 4 | 4 | + /branches/querypage-work/phase3/skins/common/jquery.js:49084,49599,49631,49951,50105,50378,50436-50437,50460 |
| 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,49599,49631,49951,50105,50378,50436-50437 |
| 6 | 6 | + /branches/querypage-work/phase3/skins/common/jquery.min.js:49084,49599,49631,49951,50105,50378,50436-50437,50460 |
| 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,49599,49631,49951,50105,50378,50436-50437 |
| /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,49631,49951,50105,50378,50436-50437,50460 |
| /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,49599,49631,49951,50105,50378,50436-50437 |
| /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,49631,49951,50105,50378,50436-50437,50460 |
| /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,49599,49631,49951,50105,50378,50436-50437 |
| /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,49631,49951,50105,50378,50436-50437,50460 |
| /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,49599,49631,49951,50105,50378,50436-50437 |
| 14 | 14 | + /branches/querypage-work/phase3/includes/ConfEditor.php:49084,49599,49631,49951,50105,50378,50436-50437,50460 |
| Index: branches/querypage-work2/phase3/includes/specials/SpecialListredirects.php |
| — | — | @@ -38,7 +38,7 @@ |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | function getOrderFields() { |
| 42 | | - return array ( 'namespace', 'title' ); |
| | 42 | + return array ( 'p1.page_namespace', 'p1.page_title' ); |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | function formatResult( $skin, $result ) { |
| Property changes on: branches/querypage-work2/phase3/includes/specials |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 46 | 46 | - /branches/REL1_15/phase3/includes/specials:51646 |
| /branches/querypage-work/phase3/includes/specials:49084,49599,49631,49951,50105,50378,50436-50437 |
| /branches/sqlite/includes/specials:58211-58321 |
| /branches/wmf-deployment/includes/specials:53381,56967 |
| 47 | 47 | + /branches/REL1_15/phase3/includes/specials:51646 |
| /branches/querypage-work/phase3/includes/specials:49084,49599,49631,49951,50105,50378,50436-50437,50460 |
| /branches/sqlite/includes/specials:58211-58321 |
| /branches/wmf-deployment/includes/specials:53381,56967 |
| Property changes on: branches/querypage-work2/phase3/includes |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 48 | 48 | - /branches/REL1_15/phase3/includes:51646 |
| /branches/querypage-work/phase3/includes:49084,49599,49631,49951,50105,50378,50436-50437 |
| /branches/sqlite/includes:58211-58321 |
| /branches/wmf-deployment/includes:53381 |
| 49 | 49 | + /branches/REL1_15/phase3/includes:51646 |
| /branches/querypage-work/phase3/includes:49084,49599,49631,49951,50105,50378,50436-50437,50460 |
| /branches/sqlite/includes:58211-58321 |
| /branches/wmf-deployment/includes:53381 |
| Property changes on: branches/querypage-work2/phase3 |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 50 | 50 | - /branches/REL1_15/phase3:51646 |
| /branches/querypage-work/phase3:49084,49599,49631,49951,50105,50378,50436-50437 |
| /branches/sqlite:58211-58321 |
| 51 | 51 | + /branches/REL1_15/phase3:51646 |
| /branches/querypage-work/phase3:49084,49599,49631,49951,50105,50378,50436-50437,50460 |
| /branches/sqlite:58211-58321 |
| Property changes on: branches/querypage-work2 |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 52 | 52 | - /branches/querypage-work:49084,49599,49631,49951,50105,50378,50436-50437 |
| 53 | 53 | + /branches/querypage-work:49084,49599,49631,49951,50105,50378,50436-50437,50460 |