http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73751
Revision: 73751
Author: reedy
Date: 2010-09-25 16:45:41 +0000 (Sat, 25 Sep 2010)
Log Message:
-----------
Fill in missing params from a dieUsage
Braces
Fixup parameter documentation
Modified Paths:
--------------
trunk/phase3/includes/GlobalFunctions.php
trunk/phase3/includes/api/ApiBase.php
trunk/phase3/includes/api/ApiMain.php
trunk/phase3/includes/api/ApiUpload.php
Modified: trunk/phase3/includes/GlobalFunctions.php
===================================================================
--- trunk/phase3/includes/GlobalFunctions.php 2010-09-25 16:38:44 UTC (rev
73750)
+++ trunk/phase3/includes/GlobalFunctions.php 2010-09-25 16:45:41 UTC (rev
73751)
@@ -3086,7 +3086,7 @@
/**
* Find a file.
* Shortcut for RepoGroup::singleton()->findFile()
- * @param $title Either a string or Title object
+ * @param $title String or Title object
* @param $options Associative array of options:
* time: requested time for an archived image, or false for the
* current version. An image object will be returned which
was
Modified: trunk/phase3/includes/api/ApiBase.php
===================================================================
--- trunk/phase3/includes/api/ApiBase.php 2010-09-25 16:38:44 UTC (rev
73750)
+++ trunk/phase3/includes/api/ApiBase.php 2010-09-25 16:45:41 UTC (rev
73751)
@@ -589,7 +589,7 @@
* Set a watch (or unwatch) based the based on a watchlist parameter.
* @param $watch String Valid values: 'watch', 'unwatch',
'preferences', 'nochange'
* @param $titleObj Title the article's title to change
- * @param $userOption The user option to consider when
$watch=preferences
+ * @param $userOption String The user option to consider when
$watch=preferences
*/
protected function setWatch ( $watch, $titleObj, $userOption = null ) {
$value = $this->getWatchlistValue( $watch, $titleObj,
$userOption );
Modified: trunk/phase3/includes/api/ApiMain.php
===================================================================
--- trunk/phase3/includes/api/ApiMain.php 2010-09-25 16:38:44 UTC (rev
73750)
+++ trunk/phase3/includes/api/ApiMain.php 2010-09-25 16:45:41 UTC (rev
73751)
@@ -637,7 +637,9 @@
$this->checkExecutePermissions( $module );
- if ( !$this->checkMaxLag( $module, $params ) ) return;
+ if ( !$this->checkMaxLag( $module, $params ) ) {
+ return;
+ }
if ( !$this->mInternalMode ) {
$this->setupExternalResponse( $module, $params );
Modified: trunk/phase3/includes/api/ApiUpload.php
===================================================================
--- trunk/phase3/includes/api/ApiUpload.php 2010-09-25 16:38:44 UTC (rev
73750)
+++ trunk/phase3/includes/api/ApiUpload.php 2010-09-25 16:45:41 UTC (rev
73751)
@@ -116,7 +116,7 @@
// Status request for an async upload
$sessionData = UploadFromUrlJob::getSessionData(
$this->mParams['statuskey'] );
if ( !isset( $sessionData['result'] ) ) {
- $this->dieUsage();
+ $this->dieUsage( 'No result in session data',
'missingresult');
}
if ( $sessionData['result'] == 'Warning' ) {
$sessionData['warnings'] =
$this->transformWarnings( $sessionData['warnings'] );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
