http://www.mediawiki.org/wiki/Special:Code/MediaWiki/82913
Revision: 82913
Author: reedy
Date: 2011-02-27 21:10:11 +0000 (Sun, 27 Feb 2011)
Log Message:
-----------
Tweak comments, remove some unused stuff.
Explicit definitions, move a few minor bits around
Modified Paths:
--------------
trunk/phase3/includes/api/ApiBase.php
trunk/phase3/includes/api/ApiBlock.php
trunk/phase3/includes/api/ApiMain.php
trunk/phase3/includes/api/ApiPageSet.php
trunk/phase3/includes/api/ApiParse.php
trunk/phase3/includes/api/ApiQueryBacklinks.php
trunk/phase3/includes/api/ApiQueryExternalLinks.php
trunk/phase3/includes/api/ApiQueryInfo.php
trunk/phase3/includes/api/ApiQueryRandom.php
trunk/phase3/includes/api/ApiQueryRecentChanges.php
trunk/phase3/includes/api/ApiQueryRevisions.php
trunk/phase3/includes/api/ApiRollback.php
Modified: trunk/phase3/includes/api/ApiBase.php
===================================================================
--- trunk/phase3/includes/api/ApiBase.php 2011-02-27 21:06:30 UTC (rev
82912)
+++ trunk/phase3/includes/api/ApiBase.php 2011-02-27 21:10:11 UTC (rev
82913)
@@ -403,6 +403,8 @@
*/
public function makeHelpMsg_callback( $matches ) {
global $wgAutoloadClasses, $wgAutoloadLocalClasses;
+
+ $file = '';
if ( isset( $wgAutoloadLocalClasses[get_class( $this )] ) ) {
$file = $wgAutoloadLocalClasses[get_class( $this )];
} elseif ( isset( $wgAutoloadClasses[get_class( $this )] ) ) {
Modified: trunk/phase3/includes/api/ApiBlock.php
===================================================================
--- trunk/phase3/includes/api/ApiBlock.php 2011-02-27 21:06:30 UTC (rev
82912)
+++ trunk/phase3/includes/api/ApiBlock.php 2011-02-27 21:10:11 UTC (rev
82913)
@@ -37,9 +37,6 @@
*/
class ApiBlock extends ApiBase {
- /**
- * Std ctor.
- */
public function __construct( $main, $action ) {
parent::__construct( $main, $action );
}
Modified: trunk/phase3/includes/api/ApiMain.php
===================================================================
--- trunk/phase3/includes/api/ApiMain.php 2011-02-27 21:06:30 UTC (rev
82912)
+++ trunk/phase3/includes/api/ApiMain.php 2011-02-27 21:10:11 UTC (rev
82913)
@@ -478,9 +478,7 @@
}
if ( $e instanceof UsageException ) {
- //
// User entered incorrect parameters - print usage
screen
- //
$errMessage = $e->getMessageArray();
// Only print the help message when this is for the
developer, not runtime
@@ -490,9 +488,7 @@
} else {
global $wgShowSQLErrors, $wgShowExceptionDetails;
- //
// Something is seriously wrong
- //
if ( ( $e instanceof DBQueryError ) &&
!$wgShowSQLErrors ) {
$info = 'Database query error';
} else {
Modified: trunk/phase3/includes/api/ApiPageSet.php
===================================================================
--- trunk/phase3/includes/api/ApiPageSet.php 2011-02-27 21:06:30 UTC (rev
82912)
+++ trunk/phase3/includes/api/ApiPageSet.php 2011-02-27 21:10:11 UTC (rev
82913)
@@ -684,7 +684,6 @@
$titleWasConverted = $unconvertedTitle
!== $titleObj->getPrefixedText();
}
-
if ( $titleObj->getNamespace() < 0 ) {
// Handle Special and Media pages
$titleObj = $titleObj->fixSpecialName();
Modified: trunk/phase3/includes/api/ApiParse.php
===================================================================
--- trunk/phase3/includes/api/ApiParse.php 2011-02-27 21:06:30 UTC (rev
82912)
+++ trunk/phase3/includes/api/ApiParse.php 2011-02-27 21:10:11 UTC (rev
82913)
@@ -253,11 +253,11 @@
if ( isset( $prop['headitems'] ) || isset( $prop['headhtml'] )
) {
$out = new OutputPage;
$out->addParserOutputNoText( $p_result );
+ $userSkin = $wgUser->getSkin();
if ( isset( $prop['headitems'] ) ) {
$headItems = $this->formatHeadItems(
$p_result->getHeadItems() );
- $userSkin = $wgUser->getSkin();
$userSkin->setupUserCss( $out );
$css = $this->formatCss(
$out->buildCssLinksArray() );
Modified: trunk/phase3/includes/api/ApiQueryBacklinks.php
===================================================================
--- trunk/phase3/includes/api/ApiQueryBacklinks.php 2011-02-27 21:06:30 UTC
(rev 82912)
+++ trunk/phase3/includes/api/ApiQueryBacklinks.php 2011-02-27 21:10:11 UTC
(rev 82913)
@@ -46,8 +46,18 @@
private $params, $contID, $redirID, $redirect;
private $bl_ns, $bl_from, $bl_table, $bl_code, $bl_title, $bl_sort,
$bl_fields, $hasNS;
- private $pageMap, $resultArr;
+ /**
+ * Maps ns and title to pageid
+ *
+ * @var array
+ */
+ private $pageMap = array();
+ private $resultArr;
+
+ private $redirTitles = array();
+ private $continueStr = null;
+
// output element name, database column field prefix, database table
private $backlinksSettings = array(
'backlinks' => array(
@@ -232,9 +242,7 @@
$res = $this->select( __METHOD__ . '::firstQuery' );
$count = 0;
- $this->pageMap = array(); // Maps ns and title to pageid
- $this->continueStr = null;
- $this->redirTitles = array();
+
foreach ( $res as $row ) {
if ( ++ $count > $this->params['limit'] ) {
// We've reached the one extra which shows that
there are additional pages to be had. Stop here...
Modified: trunk/phase3/includes/api/ApiQueryExternalLinks.php
===================================================================
--- trunk/phase3/includes/api/ApiQueryExternalLinks.php 2011-02-27 21:06:30 UTC
(rev 82912)
+++ trunk/phase3/includes/api/ApiQueryExternalLinks.php 2011-02-27 21:10:11 UTC
(rev 82913)
@@ -59,7 +59,7 @@
$this->addTables( 'externallinks' );
$this->addWhereFld( 'el_from', array_keys(
$this->getPageSet()->getGoodTitles() ) );
- //TODO: Refactor out,duplicated from ApiQueryExtLinksUsage
+ //TODO: Refactor out, duplicated from ApiQueryExtLinksUsage
if ( !is_null( $query ) || $query != '' ) {
if ( is_null( $protocol ) ) {
$protocol = 'http://';
Modified: trunk/phase3/includes/api/ApiQueryInfo.php
===================================================================
--- trunk/phase3/includes/api/ApiQueryInfo.php 2011-02-27 21:06:30 UTC (rev
82912)
+++ trunk/phase3/includes/api/ApiQueryInfo.php 2011-02-27 21:10:11 UTC (rev
82913)
@@ -41,6 +41,13 @@
$fld_readable = false, $fld_watched = false,
$fld_preload = false, $fld_displaytitle = false;
+ private $params, $titles, $missing, $everything, $pageCounter;
+
+ private $pageRestrictions, $pageIsRedir, $pageIsNew, $pageTouched,
+ $pageLatest, $pageLength;
+
+ private $protections, $watched, $talkids, $subjectids, $displaytitles;
+
private $tokenFunctions;
public function __construct( $query, $moduleName ) {
Modified: trunk/phase3/includes/api/ApiQueryRandom.php
===================================================================
--- trunk/phase3/includes/api/ApiQueryRandom.php 2011-02-27 21:06:30 UTC
(rev 82912)
+++ trunk/phase3/includes/api/ApiQueryRandom.php 2011-02-27 21:10:11 UTC
(rev 82913)
@@ -73,7 +73,11 @@
}
}
- protected function runQuery( &$resultPageSet ) {
+ /**
+ * @param $resultPageSet ApiPageSet
+ * @return int
+ */
+ protected function runQuery( $resultPageSet = null ) {
$res = $this->select( __METHOD__ );
$count = 0;
foreach ( $res as $row ) {
Modified: trunk/phase3/includes/api/ApiQueryRecentChanges.php
===================================================================
--- trunk/phase3/includes/api/ApiQueryRecentChanges.php 2011-02-27 21:06:30 UTC
(rev 82912)
+++ trunk/phase3/includes/api/ApiQueryRecentChanges.php 2011-02-27 21:10:11 UTC
(rev 82913)
@@ -43,7 +43,8 @@
private $fld_comment = false, $fld_parsedcomment = false, $fld_user =
false, $fld_userid = false,
$fld_flags = false, $fld_timestamp = false, $fld_title
= false, $fld_ids = false,
- $fld_sizes = false, $fld_redirect = false,
$fld_patrolled = false, $fld_loginfo = false, $fld_tags = false;
+ $fld_sizes = false, $fld_redirect = false,
$fld_patrolled = false, $fld_loginfo = false,
+ $fld_tags = false, $token = array();
private $tokenFunctions;
Modified: trunk/phase3/includes/api/ApiQueryRevisions.php
===================================================================
--- trunk/phase3/includes/api/ApiQueryRevisions.php 2011-02-27 21:06:30 UTC
(rev 82912)
+++ trunk/phase3/includes/api/ApiQueryRevisions.php 2011-02-27 21:10:11 UTC
(rev 82913)
@@ -39,7 +39,7 @@
class ApiQueryRevisions extends ApiQueryBase {
private $diffto, $difftotext, $expandTemplates, $generateXML, $section,
- $token;
+ $token, $parseContent;
public function __construct( $query, $moduleName ) {
parent::__construct( $query, $moduleName, 'rv' );
@@ -126,8 +126,7 @@
$params['diffto'] = 0;
}
if ( ( !ctype_digit( $params['diffto'] ) ||
$params['diffto'] < 0 )
- && $params['diffto'] != 'prev' &&
$params['diffto'] != 'next' )
- {
+ && $params['diffto'] != 'prev' &&
$params['diffto'] != 'next' ) {
$this->dieUsage( 'rvdiffto must be set to a
non-negative number, "prev", "next" or "cur"', 'diffto' );
}
// Check whether the revision exists and is readable,
@@ -176,7 +175,6 @@
$this->getResult()->setParsedLimit(
$this->getModuleName(), $limit );
}
-
if ( !is_null( $this->token ) || $pageCount > 0 ) {
$this->addFields( Revision::selectPageFields() );
}
@@ -234,7 +232,6 @@
// Bug 24166 - API error when using rvprop=tags
$this->addTables( 'revision' );
-
if ( $enumRevMode ) {
// This is mostly to prevent parameter errors (and
optimize SQL?)
if ( !is_null( $params['startid'] ) && !is_null(
$params['start'] ) ) {
Modified: trunk/phase3/includes/api/ApiRollback.php
===================================================================
--- trunk/phase3/includes/api/ApiRollback.php 2011-02-27 21:06:30 UTC (rev
82912)
+++ trunk/phase3/includes/api/ApiRollback.php 2011-02-27 21:10:11 UTC (rev
82913)
@@ -38,8 +38,16 @@
parent::__construct( $main, $action );
}
- private $mTitleObj = null, $mUser = null;
+ /**
+ * @var Title
+ */
+ private $mTitleObj = null;
+ /**
+ * @var User
+ */
+ private $mUser = null;
+
public function execute() {
$params = $this->extractRequestParams();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
