http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65322

Revision: 65322
Author:   reedy
Date:     2010-04-20 14:24:56 +0000 (Tue, 20 Apr 2010)

Log Message:
-----------
querypage-work2: Merge r50436 r50437

Modified Paths:
--------------
    branches/querypage-work2/TODO
    branches/querypage-work2/phase3/includes/specials/SpecialBrokenRedirects.php
    branches/querypage-work2/phase3/includes/specials/SpecialDeadendpages.php
    branches/querypage-work2/phase3/includes/specials/SpecialDisambiguations.php
    branches/querypage-work2/phase3/includes/specials/SpecialDoubleRedirects.php
    branches/querypage-work2/phase3/includes/specials/SpecialListredirects.php
    branches/querypage-work2/phase3/includes/specials/SpecialLonelypages.php
    
branches/querypage-work2/phase3/includes/specials/SpecialMostlinkedtemplates.php
    branches/querypage-work2/phase3/includes/specials/SpecialShortpages.php
    
branches/querypage-work2/phase3/includes/specials/SpecialUncategorizedimages.php
    
branches/querypage-work2/phase3/includes/specials/SpecialUncategorizedpages.php
    
branches/querypage-work2/phase3/includes/specials/SpecialUnusedcategories.php
    branches/querypage-work2/phase3/includes/specials/SpecialUnusedimages.php
    branches/querypage-work2/phase3/includes/specials/SpecialUnusedtemplates.php
    branches/querypage-work2/phase3/includes/specials/SpecialUnwatchedpages.php
    
branches/querypage-work2/phase3/includes/specials/SpecialWithoutinterwiki.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,49599,49631,49951,50105,50378
   + /branches/querypage-work:49084,49599,49631,49951,50105,50378,50436-50437

Modified: branches/querypage-work2/TODO
===================================================================
--- branches/querypage-work2/TODO       2010-04-20 14:22:32 UTC (rev 65321)
+++ branches/querypage-work2/TODO       2010-04-20 14:24:56 UTC (rev 65322)
@@ -1,10 +1,5 @@
 * Make INNER JOIN implicit in Unusedimages?
 * Find and migrate code using WantedPages::getSQL hook
-* Check sorting sanity
-** Check whether sorts are efficient and page right
-** Check whether sorting by nothing is really what we want
-** Check whether selecting title or ns AS value is really what we want
-* Track down and fix pages querying page info one title at a time
-* Mark ShortPages as inexpensive
 * Reuse UncategorizedPages code in UncategorizedImages somehow
 * Make UncategorizedPages parameterized by namespace
+* Run potentially inexpensive queries by Domas
\ No newline at end of file


Property changes on: branches/querypage-work2/phase3
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/REL1_15/phase3:51646
/branches/querypage-work/phase3:49084,49599,49631,49951,50105,50378
/branches/sqlite:58211-58321
   + /branches/REL1_15/phase3:51646
/branches/querypage-work/phase3:49084,49599,49631,49951,50105,50378,50436-50437
/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,49599,49631,49951,50105,50378
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
   + /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


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,49599,49631,49951,50105,50378
/branches/wmf-deployment/includes/ChangesList.php:53381,57589
   + /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


Property changes on: branches/querypage-work2/phase3/includes/ConfEditor.php
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/branches/querypage-work/phase3/includes/ConfEditor.php:49084,49599,49631,49951,50105,50378
   + 
/branches/querypage-work/phase3/includes/ConfEditor.php:49084,49599,49631,49951,50105,50378,50436-50437


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,49599,49631,49951,50105,50378
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
   + /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


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,49599,49631,49951,50105,50378
/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,49599,49631,49951,50105,50378,50436-50437
/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,49599,49631,49951,50105,50378
/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,49599,49631,49951,50105,50378,50436-50437
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967

Modified: 
branches/querypage-work2/phase3/includes/specials/SpecialBrokenRedirects.php
===================================================================
--- 
branches/querypage-work2/phase3/includes/specials/SpecialBrokenRedirects.php    
    2010-04-20 14:22:32 UTC (rev 65321)
+++ 
branches/querypage-work2/phase3/includes/specials/SpecialBrokenRedirects.php    
    2010-04-20 14:24:56 UTC (rev 65322)
@@ -16,8 +16,10 @@
                return 'BrokenRedirects';
        }
 
+       // inexpensive?
        function isExpensive() { return true; }
        function isSyndicated() { return false; }
+       function sortDescending() { return false; }
 
        function getPageHeader() {
                return wfMsgExt( 'brokenredirectstext', array( 'parse' ) );
@@ -46,8 +48,7 @@
        }
 
        function getOrderFields() {
-               // FIXME: really?
-               return array ();
+               return array ( 'rd_namespace', 'rd_title', 'rd_from' );
        }
 
        function formatResult( $skin, $result ) {

Modified: 
branches/querypage-work2/phase3/includes/specials/SpecialDeadendpages.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialDeadendpages.php   
2010-04-20 14:22:32 UTC (rev 65321)
+++ branches/querypage-work2/phase3/includes/specials/SpecialDeadendpages.php   
2010-04-20 14:24:56 UTC (rev 65322)
@@ -17,13 +17,14 @@
                return wfMsgExt( 'deadendpagestext', array( 'parse' ) );
        }
 
+       // inexpensive?
        /**
         * LEFT JOIN is expensive
         *
         * @return true
         */
        function isExpensive() {
-               return 1;
+               return true;
        }
 
        function isSyndicated() { return false; }
@@ -51,6 +52,15 @@
                        ) ) )
                );
        }
+       
+       function getOrderFields() {
+               // For some crazy reason ordering by a constant
+               // causes a filesort
+               if( count( MWNamespace::getContentNamespaces() ) > 1 )
+                       return array( 'page_namespace', 'page_title' );
+               else
+                       return array( 'page_title' );
+       }
 }
 
 /**

Modified: 
branches/querypage-work2/phase3/includes/specials/SpecialDisambiguations.php
===================================================================
--- 
branches/querypage-work2/phase3/includes/specials/SpecialDisambiguations.php    
    2010-04-20 14:22:32 UTC (rev 65321)
+++ 
branches/querypage-work2/phase3/includes/specials/SpecialDisambiguations.php    
    2010-04-20 14:24:56 UTC (rev 65322)
@@ -147,7 +147,23 @@
        function sortDescending() {
                return false;
        }
+       
+       /**
+        * Fetch  links and cache their existence
+        */
+       function preprocessResults( $db, $res ) {
+               $batch = new LinkBatch;
+               while ( $row = $db->fetchObject( $res ) )
+                       $batch->add( $row->namespace, $row->title );
+               $batch->execute();
 
+               // Back to start for display
+               if ( $db->numRows( $res ) > 0 )
+                       // If there are no rows we get an error seeking.
+                       $db->dataSeek( $res, 0 );
+       }
+
+
        function formatResult( $skin, $result ) {
                global $wgContLang;
                $title = Title::newFromID( $result->value );

Modified: 
branches/querypage-work2/phase3/includes/specials/SpecialDoubleRedirects.php
===================================================================
--- 
branches/querypage-work2/phase3/includes/specials/SpecialDoubleRedirects.php    
    2010-04-20 14:22:32 UTC (rev 65321)
+++ 
branches/querypage-work2/phase3/includes/specials/SpecialDoubleRedirects.php    
    2010-04-20 14:24:56 UTC (rev 65322)
@@ -15,14 +15,16 @@
                return 'DoubleRedirects';
        }
 
-       function isExpensive( ) { return true; }
+       // inexpensive?
+       function isExpensive() { return true; }
        function isSyndicated() { return false; }
+       function sortDescending() { return false; }
 
-       function getPageHeader( ) {
+       function getPageHeader() {
                return wfMsgExt( 'doubleredirectstext', array( 'parse' ) );
        }
 
-       function reallyGetQueryInfo($namespace = null, $title = null) {
+       function reallyGetQueryInfo( $namespace = null, $title = null ) {
                $limitToTitle = !( $namespace === null && $title === null );
                $retval = array (
                        'tables' => array ( 'redirect AS ra', 'redirect AS rb',
@@ -36,7 +38,7 @@
                                        'pc.page_title AS tc' ),
                        'conds' => array ( 'ra.rd_from = pa.page_id',
                                        'pb.page_namespace = ra.rd_namespace',
-                                       'pb.page_title = rb.rd_title',
+                                       'pb.page_title = ra.rd_title',
                                        'rb.rd_from = pb.page_id',
                                        'pc.page_namespace = rb.rd_namespace',
                                        'pc.page_title = rb.rd_title' )
@@ -53,8 +55,7 @@
        }
 
        function getOrderFields() {
-               // FIXME: really?
-               return array ();
+               return array ( 'ra.rd_namespace', 'ra.rd_title' );
        }
 
        function formatResult( $skin, $result ) {

Modified: 
branches/querypage-work2/phase3/includes/specials/SpecialListredirects.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialListredirects.php  
2010-04-20 14:22:32 UTC (rev 65321)
+++ branches/querypage-work2/phase3/includes/specials/SpecialListredirects.php  
2010-04-20 14:24:56 UTC (rev 65322)
@@ -15,22 +15,30 @@
 class ListredirectsPage extends QueryPage {
 
        function getName() { return 'Listredirects'; }
+       // inexpensive?
        function isExpensive() { return true; }
        function isSyndicated() { return false; }
        function sortDescending() { return false; }
 
        function getQueryInfo() {
-               return array (
-                       'tables' => array ( 'page' ),
-                       'fields' => array ( 'page_namespace AS namespace',
-                                       'page_title AS title' ),
-                       'conds' => array ( 'page_is_redirect' => 1 )
+               return array(
+                       'tables' => array( 'page AS p1', 'redirect', 'page AS 
p2' ),
+                       'fields' => array( 'p1.page_namespace AS namespace',
+                                       'p1.page_title AS title',
+                                       'rd_namespace',
+                                       'rd_title',
+                                       'p2.page_id AS redirid' ),
+                       'conds' => array( 'p1.page_is_redirect' => 1 ),
+                       'join_conds' => array( 'redirect' => array(
+                                       'LEFT JOIN', 'rd_from=p1.page_id' ),
+                               'page AS p2' => array( 'LEFT JOIN', array(
+                                       'p2.page_namespace=rd_namespace',
+                                       'p2.page_title=rd_title' ) ) )
                );
        }
 
        function getOrderFields() {
-               // FIXME: really?
-               return array ();
+               return array ( 'namespace', 'title' );
        }
 
        function formatResult( $skin, $result ) {
@@ -38,25 +46,33 @@
 
                # Make a link to the redirect itself
                $rd_title = Title::makeTitle( $result->namespace, 
$result->title );
-               $rd_link = $skin->link(
+               $rd_link = $skin->makeKnownLinkObj(
                        $rd_title,
                        null,
-                       array(),
-                       array( 'redirect' => 'no' )
+                       'redirect=no'
                );
 
                # Find out where the redirect leads
-               $revision = Revision::newFromTitle( $rd_title );
-               if( $revision ) {
-                       # Make a link to the destination page
-                       $target = Title::newFromRedirect( $revision->getText() 
);
-                       if( $target ) {
-                               $arr = $wgContLang->getArrow() . 
$wgContLang->getDirMark();
+               $target = null;
+               if( !is_null( $result->rd_namespace ) ) {
+                       $target = Title::makeTitle( $result->rd_namespace, 
$result->rd_title );
+               } else {
+                       $revision = Revision::newFromTitle( $rd_title );
+                       if( $revision ) {
+                               $target = Title::newFromRedirect( 
$revision->getText() );
+                       }
+               }
+               
+               # Make a link to the destination page
+               if( $target ) {
+                       $arr = $wgContLang->getArrow() . 
$wgContLang->getDirMark();
+                       if( !is_null ( $result->redirid ) )
+                               $targetLink = $skin->makeKnownLinkObj( $target 
);
+                       else if( !is_null( $result->rd_namespace ) )
+                               $targetLink = $skin->makeBrokenLinkObj( $target 
);
+                       else
                                $targetLink = $skin->link( $target );
-                               return "$rd_link $arr $targetLink";
-                       } else {
-                               return "<s>$rd_link</s>";
-                       }
+                       return "$rd_link $arr $targetLink";
                } else {
                        return "<s>$rd_link</s>";
                }

Modified: 
branches/querypage-work2/phase3/includes/specials/SpecialLonelypages.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialLonelypages.php    
2010-04-20 14:22:32 UTC (rev 65321)
+++ branches/querypage-work2/phase3/includes/specials/SpecialLonelypages.php    
2010-04-20 14:24:56 UTC (rev 65322)
@@ -22,6 +22,7 @@
                return false;
        }
 
+       // inexpensive?
        function isExpensive() {
                return true;
        }
@@ -49,6 +50,15 @@
                                                'tl_title = page_title' ) ) )
                );
        }
+       
+       function getOrderFields() {
+               // For some crazy reason ordering by a constant
+               // causes a filesort
+               if( count( MWNamespace::getContentNamespaces() ) > 1 )
+                       return array( 'page_namespace', 'page_title' );
+               else
+                       return array( 'page_title' );
+       }
 }
 
 /**

Modified: 
branches/querypage-work2/phase3/includes/specials/SpecialMostlinkedtemplates.php
===================================================================
--- 
branches/querypage-work2/phase3/includes/specials/SpecialMostlinkedtemplates.php
    2010-04-20 14:22:32 UTC (rev 65321)
+++ 
branches/querypage-work2/phase3/includes/specials/SpecialMostlinkedtemplates.php
    2010-04-20 14:24:56 UTC (rev 65322)
@@ -84,7 +84,7 @@
         * @return String
         */
        public function formatResult( $skin, $result ) {
-               $title = Title::makeTitleSafe( $result->namespace, 
$result->title );
+               $title = Title::makeTitle( $result->namespace, $result->title );
 
                return wfSpecialList(
                        $skin->link( $title ),

Modified: 
branches/querypage-work2/phase3/includes/specials/SpecialShortpages.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialShortpages.php     
2010-04-20 14:22:32 UTC (rev 65321)
+++ branches/querypage-work2/phase3/includes/specials/SpecialShortpages.php     
2010-04-20 14:24:56 UTC (rev 65322)
@@ -15,9 +15,9 @@
                return 'Shortpages';
        }
 
+       // inexpensive?
        /**
         * This query is indexed as of 1.5
-        * FIXME: Mark as inexpensive
         */
        function isExpensive() {
                return true;
@@ -60,7 +60,7 @@
                global $wgLang, $wgContLang;
                $dm = $wgContLang->getDirMark();
 
-               $title = Title::makeTitleSafe( $result->namespace, 
$result->title );
+               $title = Title::makeTitle( $result->namespace, $result->title );
                if ( !$title ) {
                        return '<!-- Invalid title ' .  htmlspecialchars( 
"{$result->namespace}:{$result->title}" ). '-->';
                }
@@ -75,9 +75,9 @@
                                        : $skin->linkKnown( $title );
                $size = wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ), 
$wgLang->formatNum( htmlspecialchars( $result->value ) ) );
 
-               return $title->exists()
-                               ? "({$hlink}) {$dm}{$plink} {$dm}[{$size}]"
-                               : "<s>({$hlink}) {$dm}{$plink} 
{$dm}[{$size}]</s>";
+               return ($this->isCached() && !$title->exists())
+                               ? "<s>({$hlink}) {$dm}{$plink} 
{$dm}[{$size}]</s>"
+                               : "({$hlink}) {$dm}{$plink} {$dm}[{$size}]";
        }
 }
 

Modified: 
branches/querypage-work2/phase3/includes/specials/SpecialUncategorizedimages.php
===================================================================
--- 
branches/querypage-work2/phase3/includes/specials/SpecialUncategorizedimages.php
    2010-04-20 14:22:32 UTC (rev 65321)
+++ 
branches/querypage-work2/phase3/includes/specials/SpecialUncategorizedimages.php
    2010-04-20 14:24:56 UTC (rev 65322)
@@ -21,6 +21,7 @@
                return false;
        }
 
+       // inexpensive?
        function isExpensive() {
                return true;
        }
@@ -28,17 +29,6 @@
        function isSyndicated() {
                return false;
        }
-
-       function getSQL() {
-               $dbr = wfGetDB( DB_SLAVE );
-               list( $page, $categorylinks ) = $dbr->tableNamesN( 'page', 
'categorylinks' );
-               $ns = NS_FILE;
-
-               return "SELECT 'Uncategorizedimages' AS type, page_namespace AS 
namespace,
-                               page_title AS title, page_title AS value
-                               FROM {$page} LEFT JOIN {$categorylinks} ON 
page_id = cl_from
-                               WHERE cl_from IS NULL AND page_namespace = 
{$ns} AND page_is_redirect = 0";
-       }
        
        function getQueryInfo() {
                return array (

Modified: 
branches/querypage-work2/phase3/includes/specials/SpecialUncategorizedpages.php
===================================================================
--- 
branches/querypage-work2/phase3/includes/specials/SpecialUncategorizedpages.php 
    2010-04-20 14:22:32 UTC (rev 65321)
+++ 
branches/querypage-work2/phase3/includes/specials/SpecialUncategorizedpages.php 
    2010-04-20 14:24:56 UTC (rev 65322)
@@ -20,6 +20,7 @@
                return false;
        }
 
+       // inexpensive?
        function isExpensive() {
                return true;
        }
@@ -40,6 +41,14 @@
                                        'LEFT JOIN', 'cl_from = page_id' ) )
                );
        }
+       
+       function getOrderFields() {
+               // For some crazy reason ordering by a constant
+               // causes a filesort
+               if( $this->requestedNamespace === false && count( 
MWNamespace::getContentNamespaces() ) > 1 )
+                       return array( 'page_namespace', 'page_title' );
+               return array( 'page_title' );
+       }
 }
 
 /**

Modified: 
branches/querypage-work2/phase3/includes/specials/SpecialUnusedcategories.php
===================================================================
--- 
branches/querypage-work2/phase3/includes/specials/SpecialUnusedcategories.php   
    2010-04-20 14:22:32 UTC (rev 65321)
+++ 
branches/querypage-work2/phase3/includes/specials/SpecialUnusedcategories.php   
    2010-04-20 14:24:56 UTC (rev 65322)
@@ -9,6 +9,7 @@
  */
 class UnusedCategoriesPage extends QueryPage {
 
+       // inexpensive?
        function isExpensive() { return true; }
 
        function getName() {
@@ -35,7 +36,7 @@
 
        function formatResult( $skin, $result ) {
                $title = Title::makeTitle( NS_CATEGORY, $result->title );
-               return $skin->link( $title, $title->getText() );
+               return $skin->makeKnownLinkObj( $title, $title->getText() );
        }
 }
 

Modified: 
branches/querypage-work2/phase3/includes/specials/SpecialUnusedimages.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialUnusedimages.php   
2010-04-20 14:22:32 UTC (rev 65321)
+++ branches/querypage-work2/phase3/includes/specials/SpecialUnusedimages.php   
2010-04-20 14:24:56 UTC (rev 65322)
@@ -10,6 +10,7 @@
  */
 class UnusedimagesPage extends ImageQueryPage {
 
+       // inexpensive?
        function isExpensive() { return true; }
 
        function getName() {

Modified: 
branches/querypage-work2/phase3/includes/specials/SpecialUnusedtemplates.php
===================================================================
--- 
branches/querypage-work2/phase3/includes/specials/SpecialUnusedtemplates.php    
    2010-04-20 14:22:32 UTC (rev 65321)
+++ 
branches/querypage-work2/phase3/includes/specials/SpecialUnusedtemplates.php    
    2010-04-20 14:24:56 UTC (rev 65322)
@@ -14,6 +14,7 @@
 class UnusedtemplatesPage extends QueryPage {
 
        function getName() { return( 'Unusedtemplates' ); }
+       // inexpensive?
        function isExpensive() { return true; }
        function isSyndicated() { return false; }
        function sortDescending() { return false; }
@@ -23,7 +24,7 @@
                        'tables' => array ( 'page', 'templatelinks' ),
                        'fields' => array ( 'page_namespace AS namespace',
                                        'page_title AS title',
-                                       '0 AS value' ),
+                                       'page_title AS value' ),
                        'conds' => array ( 'page_namespace' => NS_TEMPLATE,
                                        'tl_from IS NULL',
                                        'page_is_redirect' => 0 ),
@@ -32,7 +33,7 @@
                                        'tl_namespace = page_namespace' ) ) )
                );
        }
-
+       
        function formatResult( $skin, $result ) {
                $title = Title::makeTitle( NS_TEMPLATE, $result->title );
                $pageLink = $skin->linkKnown(

Modified: 
branches/querypage-work2/phase3/includes/specials/SpecialUnwatchedpages.php
===================================================================
--- branches/querypage-work2/phase3/includes/specials/SpecialUnwatchedpages.php 
2010-04-20 14:22:32 UTC (rev 65321)
+++ branches/querypage-work2/phase3/includes/specials/SpecialUnwatchedpages.php 
2010-04-20 14:24:56 UTC (rev 65322)
@@ -16,6 +16,7 @@
 class UnwatchedpagesPage extends QueryPage {
 
        function getName() { return 'Unwatchedpages'; }
+       // inexpensive?
        function isExpensive() { return true; }
        function isSyndicated() { return false; }
 
@@ -36,6 +37,9 @@
        }
 
        function sortDescending() { return false; }
+       
+       function getOrderFields() {
+               return array( 'page_namespace', 'page_title' );
 
        function formatResult( $skin, $result ) {
                global $wgContLang;

Modified: 
branches/querypage-work2/phase3/includes/specials/SpecialWithoutinterwiki.php
===================================================================
--- 
branches/querypage-work2/phase3/includes/specials/SpecialWithoutinterwiki.php   
    2010-04-20 14:22:32 UTC (rev 65321)
+++ 
branches/querypage-work2/phase3/includes/specials/SpecialWithoutinterwiki.php   
    2010-04-20 14:24:56 UTC (rev 65322)
@@ -41,7 +41,12 @@
        function sortDescending() {
                return false;
        }
+       
+       function getOrderFields() {
+               return array( 'page_namespace', 'page_title' );
+       }
 
+       // inexpensive?
        function isExpensive() {
                return true;
        }


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,49599,49631,49951,50105,50378
/branches/wmf-deployment/maintenance/cleanupTable.inc:56715
   + /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


Property changes on: branches/querypage-work2/phase3/skins/common/jquery.js
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/branches/querypage-work/phase3/skins/common/jquery.js:49084,49599,49631,49951,50105,50378
   + 
/branches/querypage-work/phase3/skins/common/jquery.js:49084,49599,49631,49951,50105,50378,50436-50437


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,49599,49631,49951,50105,50378
   + 
/branches/querypage-work/phase3/skins/common/jquery.min.js:49084,49599,49631,49951,50105,50378,50436-50437



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to