r65325 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r65324‎ \| r65325 \| r65326 >
Date:	14:28, 20 April 2010
Author:	reedy
Status:	deferred
Tags:
Comment:	querypage-work2: Merge r51517
Modified paths:	/branches/querypage-work2 (modified) (history) /branches/querypage-work2/phase3 (modified) (history) /branches/querypage-work2/phase3/includes (modified) (history) /branches/querypage-work2/phase3/includes/ChangesList.php (modified) (history) /branches/querypage-work2/phase3/includes/ConfEditor.php (modified) (history) /branches/querypage-work2/phase3/includes/OutputPage.php (modified) (history) /branches/querypage-work2/phase3/includes/QueryPage.php (modified) (history) /branches/querypage-work2/phase3/includes/api (modified) (history) /branches/querypage-work2/phase3/includes/specials (modified) (history) /branches/querypage-work2/phase3/maintenance/cleanupTable.inc (modified) (history) /branches/querypage-work2/phase3/skins/common/jquery.js (modified) (history) /branches/querypage-work2/phase3/skins/common/jquery.min.js (modified) (history)

Diff [purge]

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,50460,50476
/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,50476,51517
/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,50460,50476
4	4	+ /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
___________________________________________________________________
Name: svn:mergeinfo
5	5	- /branches/querypage-work/phase3/skins/common/jquery.min.js:49084,49599,49631,49951,50105,50378,50436-50437,50460,50476
6	6	+ /branches/querypage-work/phase3/skins/common/jquery.min.js:49084,49599,49631,49951,50105,50378,50436-50437,50460,50476,51517
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,50460,50476
/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,50476,51517
/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,50460,50476
/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,50476,51517
/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,50460,50476
/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,50476,51517
/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,50460,50476
14	14	+ /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/specials
___________________________________________________________________
Name: svn:mergeinfo
15	15	- /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
16	16	+ /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
Index: branches/querypage-work2/phase3/includes/QueryPage.php
—	—	@@ -82,13 +82,6 @@
83	83	var $shownavigation = true;
84	84
85	85	/**
86		~~- * Constructor~~
87		~~- */~~
88		~~- public function __construct() {~~
89		~~- parent::__construct( $this->getName() );~~
90		~~- }~~
91		-
92		- /**
93	86	* A mutator for $this->listoutput;
94	87	*
95	88	* @param $bool Boolean
—	—	@@ -394,23 +387,23 @@
395	388	* real, honest-to-gosh query page.
396	389	*/
397	390	function execute( $par ) {
398		~~- global $wgUser, $wgOut, $wgLang, $wgContLang;~~
399		-
400		~~- list( $this->offset, $this->limit ) = wfCheckLimits();~~
401		-
	391	+ global $wgUser, $wgOut, $wgLang;
	392	+
	393	+ list( $this->limit, $this->offset ) = wfCheckLimits();
402	394	$sname = $this->getName();
403		~~- $fname = get_class($this) . '::doQuery';~~
	395	+ $fname = get_class( $this ) . '::doQuery';
404	396	$dbr = wfGetDB( DB_SLAVE );
405	397
	398	+ $this->setHeaders();
406	399	$wgOut->setSyndicated( $this->isSyndicated() );
407	400
408	401	// TODO: Use doQuery()
409	402	//$res = null;
410	403	if ( !$this->isCached() ) {
411		~~- $res = $this->reallyDoQuery( $limit, $offset );~~
	404	+ $res = $this->reallyDoQuery( $this->limit, $this->offset );
412	405	} else {
413	406	# Get the cached result
414		~~- $res = $this->fetchFromCache( $limit, $offset );~~
	407	+ $res = $this->fetchFromCache( $this->limit, $this->offset );
415	408	if( !$this->listoutput ) {
416	409
417	410	# Fetch the timestamp of this update
—	—	@@ -449,10 +442,11 @@
450	443	if( $this->shownavigation ) {
451	444	$wgOut->addHTML( $this->getPageHeader() );
452	445	if( $num > 0 ) {
453		~~- $wgOut->addHTML( '<p>' . wfShowingResults( $offset, $num ) . '</p>' );~~
	446	+ $wgOut->addHTML( '<p>' . wfShowingResults( $this->offset, $num ) . '</p>' );
454	447	# Disable the "next" link when we reach the end
455		~~- $paging = wfViewPrevNext( $offset, $limit, $wgContLang->specialPage( $sname ),~~
456		~~- wfArrayToCGI( $this->linkParameters() ), ( $num < $limit ) );~~
	448	+ $paging = wfViewPrevNext( $this->offset, $this->limit,
	449	+ $this->getTitle( $par ),
	450	+ wfArrayToCGI( $this->linkParameters() ), ( $num < $this->limit ) );
457	451	$wgOut->addHTML( '<p>' . $paging . '</p>' );
458	452	} else {
459	453	# No results to show, so don't bother with "showing X of Y" etc.
—	—	@@ -471,10 +465,10 @@
472	466	$dbr, # Should use a ResultWrapper for this
473	467	$res,
474	468	$dbr->numRows( $res ),
475		~~- $offset );~~
	469	+ $this->offset );
476	470
477	471	# Repeat the paging links at the bottom
478		~~- if( $shownavigation ) {~~
	472	+ if( $this->shownavigation ) {
479	473	$wgOut->addHTML( '<p>' . $paging . '</p>' );
480	474	}
481	475
Property changes on: branches/querypage-work2/phase3/includes
___________________________________________________________________
Name: svn:mergeinfo
482	476	- /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
483	477	+ /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
___________________________________________________________________
Name: svn:mergeinfo
484	478	- /branches/REL1_15/phase3:51646
/branches/querypage-work/phase3:49084,49599,49631,49951,50105,50378,50436-50437,50460,50476
/branches/sqlite:58211-58321
485	479	+ /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
___________________________________________________________________
Name: svn:mergeinfo
486	480	- /branches/querypage-work:49084,49599,49631,49951,50105,50378,50436-50437,50460,50476
487	481	+ /branches/querypage-work:49084,49599,49631,49951,50105,50378,50436-50437,50460,50476,51517

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r51517	querypage-work: Minor fixes for QueryPage.php	catrope	20:16, 5 June 2009

Status & tagging log

18:58, 10 May 2010 Reedy (talk | contribs) changed the status of r65325 [removed: new added: deferred]