https://www.mediawiki.org/wiki/Special:Code/MediaWiki/102083
Revision: 102083
Author: aaron
Date: 2011-11-05 04:14:09 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
Made use of Pager::doBatchLookups() and Pager::getUser() in special page Pagers
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/presentation/FlaggedRevsXML.php
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/ConfiguredPages_body.php
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/PendingChanges_body.php
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/ProblemChanges_body.php
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/ReviewedPages_body.php
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/StablePages_body.php
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/UnreviewedPages_body.php
Modified: trunk/extensions/FlaggedRevs/presentation/FlaggedRevsXML.php
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/FlaggedRevsXML.php
2011-11-05 02:06:51 UTC (rev 102082)
+++ trunk/extensions/FlaggedRevs/presentation/FlaggedRevsXML.php
2011-11-05 04:14:09 UTC (rev 102083)
@@ -57,13 +57,16 @@
) {
$s = "<label for='wpLevel'>" . wfMsgHtml(
'revreview-levelfilter' ) . "</label>\n";
$s .= Xml::openElement( 'select', array( 'name' => 'level',
'id' => 'wpLevel' ) );
- if ( $all !== false )
+ if ( $all !== false ) {
$s .= Xml::option( wfMsg( $all ), - 1, $selected === -
1 );
+ }
$s .= Xml::option( wfMsg( 'revreview-lev-basic' ), 0, $selected
=== 0 );
- if ( FlaggedRevs::qualityVersions() )
+ if ( FlaggedRevs::qualityVersions() ) {
$s .= Xml::option( wfMsg( 'revreview-lev-quality' ), 1,
$selected === 1 );
- if ( $max >= 2 && FlaggedRevs::pristineVersions() )
+ }
+ if ( $max >= 2 && FlaggedRevs::pristineVersions() ) {
$s .= Xml::option( wfMsg( 'revreview-lev-pristine' ),
2, $selected === 2 );
+ }
# Note: Pristine not tracked at sp:QualityOversight (counts as
quality)
$s .= Xml::closeElement( 'select' ) . "\n";
return $s;
Modified:
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/ConfiguredPages_body.php
===================================================================
---
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/ConfiguredPages_body.php
2011-11-05 02:06:51 UTC (rev 102082)
+++
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/ConfiguredPages_body.php
2011-11-05 04:14:09 UTC (rev 102083)
@@ -177,18 +177,20 @@
return 'fpc_page_id';
}
- function getStartBody() {
+ function doBatchLookups() {
wfProfileIn( __METHOD__ );
- # Do a link batch query
$lb = new LinkBatch();
foreach ( $this->mResult as $row ) {
$lb->add( $row->page_namespace, $row->page_title );
}
$lb->execute();
wfProfileOut( __METHOD__ );
+ }
+
+ function getStartBody() {
return '<ul>';
}
-
+
function getEndBody() {
return '</ul>';
}
Modified:
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/PendingChanges_body.php
===================================================================
---
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/PendingChanges_body.php
2011-11-05 02:06:51 UTC (rev 102082)
+++
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/PendingChanges_body.php
2011-11-05 04:14:09 UTC (rev 102083)
@@ -339,13 +339,12 @@
$query['category'] = $this->category;
return $query;
}
-
+
function getDefaultDirections() {
return false;
}
function getQueryInfo() {
- global $wgUser;
$tables = array( 'page', 'revision' );
$fields = array( 'page_namespace', 'page_title', 'page_len',
'rev_len', 'page_latest' );
# Show outdated "stable" versions
@@ -401,11 +400,14 @@
$conds['page_namespace'] = $this->namespace;
}
# Filter by watchlist
- if ( $this->watched && ( $uid = $wgUser->getId() ) ) {
- $tables[] = 'watchlist';
- $conds[] = "wl_user = '$uid'";
- $conds[] = 'page_namespace = wl_namespace';
- $conds[] = 'page_title = wl_title';
+ if ( $this->watched ) {
+ $uid = (int)$this->getUser()->getId();
+ if ( $uid ) {
+ $tables[] = 'watchlist';
+ $conds[] = "wl_user = '$uid'";
+ $conds[] = 'page_namespace = wl_namespace';
+ $conds[] = 'page_title = wl_title';
+ }
}
# Filter by bytes changed
if ( $this->size !== null && $this->size >= 0 ) {
@@ -423,19 +425,21 @@
function getIndexField() {
return $this->mIndexField;
}
-
- function getStartBody() {
+
+ function doBatchLookups() {
wfProfileIn( __METHOD__ );
- # Do a link batch query
$lb = new LinkBatch();
foreach ( $this->mResult as $row ) {
$lb->add( $row->page_namespace, $row->page_title );
}
$lb->execute();
wfProfileOut( __METHOD__ );
+ }
+
+ function getStartBody() {
return '<ul>';
}
-
+
function getEndBody() {
return '</ul>';
}
Modified:
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/ProblemChanges_body.php
===================================================================
---
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/ProblemChanges_body.php
2011-11-05 02:06:51 UTC (rev 102082)
+++
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/ProblemChanges_body.php
2011-11-05 04:14:09 UTC (rev 102083)
@@ -314,7 +314,7 @@
function formatRow( $row ) {
return $this->mForm->formatRow( $row );
}
-
+
function getDefaultDirections() {
return false;
}
@@ -394,19 +394,21 @@
function getIndexField() {
return $this->mIndexField;
}
-
- function getStartBody() {
+
+ function doBatchLookups() {
wfProfileIn( __METHOD__ );
- # Do a link batch query
$lb = new LinkBatch();
foreach ( $this->mResult as $row ) {
$lb->add( $row->page_namespace, $row->page_title );
}
$lb->execute();
wfProfileOut( __METHOD__ );
+ }
+
+ function getStartBody() {
return '<ul>';
}
-
+
function getEndBody() {
return '</ul>';
}
Modified:
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/ReviewedPages_body.php
===================================================================
---
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/ReviewedPages_body.php
2011-11-05 02:06:51 UTC (rev 102082)
+++
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/ReviewedPages_body.php
2011-11-05 04:14:09 UTC (rev 102083)
@@ -166,27 +166,30 @@
'tables' => array( 'flaggedpages', 'page' ),
'fields' =>
'page_namespace,page_title,page_len,fp_page_id',
'conds' => $conds,
- 'options' => array( 'USE INDEX' => array(
'flaggedpages' => $index,
- 'page' => 'PRIMARY' ) )
+ 'options' => array(
+ 'USE INDEX' => array( 'flaggedpages' => $index,
'page' => 'PRIMARY' )
+ )
);
}
function getIndexField() {
return 'fp_page_id';
}
-
- function getStartBody() {
+
+ function doBatchLookups() {
wfProfileIn( __METHOD__ );
- # Do a link batch query
$lb = new LinkBatch();
foreach ( $this->mResult as $row ) {
$lb->add( $row->page_namespace, $row->page_title );
}
$lb->execute();
wfProfileOut( __METHOD__ );
+ }
+
+ function getStartBody() {
return '<ul>';
}
-
+
function getEndBody() {
return '</ul>';
}
Modified:
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/StablePages_body.php
===================================================================
---
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/StablePages_body.php
2011-11-05 02:06:51 UTC (rev 102082)
+++
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/StablePages_body.php
2011-11-05 04:14:09 UTC (rev 102083)
@@ -168,19 +168,21 @@
function getIndexField() {
return 'fpc_page_id';
}
-
- function getStartBody() {
+
+ function doBatchLookups() {
wfProfileIn( __METHOD__ );
- # Do a link batch query
$lb = new LinkBatch();
foreach ( $this->mResult as $row ) {
$lb->add( $row->page_namespace, $row->page_title );
}
$lb->execute();
wfProfileOut( __METHOD__ );
+ }
+
+ function getStartBody() {
return '<ul>';
}
-
+
function getEndBody() {
return '</ul>';
}
Modified:
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/UnreviewedPages_body.php
===================================================================
---
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/UnreviewedPages_body.php
2011-11-05 02:06:51 UTC (rev 102082)
+++
trunk/extensions/FlaggedRevs/presentation/specialpages/reports/UnreviewedPages_body.php
2011-11-05 04:14:09 UTC (rev 102083)
@@ -432,15 +432,17 @@
return $this->mIndexField;
}
- function getStartBody() {
+ function doBatchLookups() {
wfProfileIn( __METHOD__ );
- # Do a link batch query
$lb = new LinkBatch();
foreach ( $this->mResult as $row ) {
$lb->add( $row->page_namespace, $row->page_title );
}
$lb->execute();
wfProfileOut( __METHOD__ );
+ }
+
+ function getStartBody() {
return '<ul>';
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
