r94548 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r94547‎ | r94548 | r94549 >
Date:18:56, 15 August 2011
Author:reedy
Status:ok
Tags:
Comment:
Followup r92430 per CR, like r94448
Modified paths:
  • /trunk/phase3/includes/SpecialPage.php (modified) (history)
  • /trunk/phase3/includes/api/ApiParamInfo.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/SpecialPage.php
@@ -545,7 +545,7 @@
546546 if ( $this->userCanExecute( $this->getUser() ) ) {
547547 $func = $this->mFunction;
548548 // only load file if the function does not exist
549 - if(!is_callable($func) and $this->mFile) {
 549+ if( !is_callable($func) && $this->mFile ) {
550550 require_once( $this->mFile );
551551 }
552552 $this->outputHeader();
Index: trunk/phase3/includes/api/ApiParamInfo.php
@@ -123,6 +123,9 @@
124124 $result->setIndexedTagName( $retval['helpurls'], 'helpurl' );
125125
126126 $retval['allexamples'] = $examples;
 127+ if ( isset( $retval['allexamples'][0] ) && $retval['allexamples'][0] === false ) {
 128+ $retval['allexamples'] = array();
 129+ }
127130 $result->setIndexedTagName( $retval['allexamples'], 'example' );
128131
129132 $retval['parameters'] = array();

Sign-offs

UserFlagDate
Nikerabbitinspected11:04, 16 August 2011

Follow-up revisions

RevisionCommit summaryAuthorDate
r964701.17wmf1: MFT r92962, r93062, r93093, r93385, r93468, r93473, r94350, r94502,...catrope19:07, 7 September 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r92430* (bug 29935) Improve formatting of examples in ApiParamInfo...reedy13:19, 18 July 2011
r94448ApiParamInfo: if no help URLs are available, return an empty array instead of...maxsem09:37, 14 August 2011

Status & tagging log