http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65325
Revision: 65325
Author: reedy
Date: 2010-04-20 14:28:36 +0000 (Tue, 20 Apr 2010)
Log Message:
-----------
querypage-work2: Merge r51517
Modified Paths:
--------------
branches/querypage-work2/phase3/includes/QueryPage.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,50436-50437,50460,50476
+
/branches/querypage-work:49084,49599,49631,49951,50105,50378,50436-50437,50460,50476,51517
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,50436-50437,50460,50476
/branches/sqlite:58211-58321
+ /branches/REL1_15/phase3:51646
/branches/querypage-work/phase3:49084,49599,49631,49951,50105,50378,50436-50437,50460,50476,51517
/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,50436-50437,50460,50476
/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,50460,50476,51517
/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,50436-50437,50460,50476
/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,50460,50476,51517
/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,50436-50437,50460,50476
+
/branches/querypage-work/phase3/includes/ConfEditor.php:49084,49599,49631,49951,50105,50378,50436-50437,50460,50476,51517
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,50436-50437,50460,50476
/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,50460,50476,51517
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
Modified: branches/querypage-work2/phase3/includes/QueryPage.php
===================================================================
--- branches/querypage-work2/phase3/includes/QueryPage.php 2010-04-20
14:26:29 UTC (rev 65324)
+++ branches/querypage-work2/phase3/includes/QueryPage.php 2010-04-20
14:28:36 UTC (rev 65325)
@@ -82,13 +82,6 @@
var $shownavigation = true;
/**
- * Constructor
- */
- public function __construct() {
- parent::__construct( $this->getName() );
- }
-
- /**
* A mutator for $this->listoutput;
*
* @param $bool Boolean
@@ -394,23 +387,23 @@
* real, honest-to-gosh query page.
*/
function execute( $par ) {
- global $wgUser, $wgOut, $wgLang, $wgContLang;
-
- list( $this->offset, $this->limit ) = wfCheckLimits();
-
+ global $wgUser, $wgOut, $wgLang;
+
+ list( $this->limit, $this->offset ) = wfCheckLimits();
$sname = $this->getName();
- $fname = get_class($this) . '::doQuery';
+ $fname = get_class( $this ) . '::doQuery';
$dbr = wfGetDB( DB_SLAVE );
+ $this->setHeaders();
$wgOut->setSyndicated( $this->isSyndicated() );
// TODO: Use doQuery()
//$res = null;
if ( !$this->isCached() ) {
- $res = $this->reallyDoQuery( $limit, $offset );
+ $res = $this->reallyDoQuery( $this->limit,
$this->offset );
} else {
# Get the cached result
- $res = $this->fetchFromCache( $limit, $offset );
+ $res = $this->fetchFromCache( $this->limit,
$this->offset );
if( !$this->listoutput ) {
# Fetch the timestamp of this update
@@ -449,10 +442,11 @@
if( $this->shownavigation ) {
$wgOut->addHTML( $this->getPageHeader() );
if( $num > 0 ) {
- $wgOut->addHTML( '<p>' . wfShowingResults(
$offset, $num ) . '</p>' );
+ $wgOut->addHTML( '<p>' . wfShowingResults(
$this->offset, $num ) . '</p>' );
# Disable the "next" link when we reach the end
- $paging = wfViewPrevNext( $offset, $limit,
$wgContLang->specialPage( $sname ),
- wfArrayToCGI( $this->linkParameters()
), ( $num < $limit ) );
+ $paging = wfViewPrevNext( $this->offset,
$this->limit,
+ $this->getTitle( $par ),
+ wfArrayToCGI( $this->linkParameters()
), ( $num < $this->limit ) );
$wgOut->addHTML( '<p>' . $paging . '</p>' );
} else {
# No results to show, so don't bother with
"showing X of Y" etc.
@@ -471,10 +465,10 @@
$dbr, # Should use a ResultWrapper for this
$res,
$dbr->numRows( $res ),
- $offset );
+ $this->offset );
# Repeat the paging links at the bottom
- if( $shownavigation ) {
+ if( $this->shownavigation ) {
$wgOut->addHTML( '<p>' . $paging . '</p>' );
}
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,50436-50437,50460,50476
/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,50460,50476,51517
/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,50436-50437,50460,50476
/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,50460,50476,51517
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
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,50436-50437,50460,50476
/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,50460,50476,51517
/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,50436-50437,50460,50476
+
/branches/querypage-work/phase3/skins/common/jquery.js:49084,49599,49631,49951,50105,50378,50436-50437,50460,50476,51517
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,50436-50437,50460,50476
+
/branches/querypage-work/phase3/skins/common/jquery.min.js:49084,49599,49631,49951,50105,50378,50436-50437,50460,50476,51517
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
