r97160 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r97159‎ | r97160 | r97161 >
Date:15:40, 15 September 2011
Author:catrope
Status:ok
Tags:
Comment:
Followup r93247: add apiScript as a property of a ResourceLoader source.
Modified paths:
  • /trunk/phase3/includes/DefaultSettings.php (modified) (history)
  • /trunk/phase3/includes/resourceloader/ResourceLoader.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/DefaultSettings.php
@@ -2478,7 +2478,10 @@
24792479 * ResourceLoader::__construct() so that it cannot be unset.
24802480 *
24812481 * Example:
2482 - * $wgResourceLoaderSources['foo'] = array( 'loadScript' => 'http://example.org/w/load.php' );
 2482+ * $wgResourceLoaderSources['foo'] = array(
 2483+ * 'loadScript' => 'http://example.org/w/load.php',
 2484+ * 'apiScript' => 'http://example.org/w/api.php'
 2485+ * );
24832486 */
24842487 $wgResourceLoaderSources = array();
24852488
Index: trunk/phase3/includes/resourceloader/ResourceLoader.php
@@ -188,7 +188,7 @@
189189 wfProfileIn( __METHOD__ );
190190
191191 // Add 'local' source first
192 - $this->addSource( 'local', array( 'loadScript' => $wgLoadScript ) );
 192+ $this->addSource( 'local', array( 'loadScript' => $wgLoadScript, 'apiScript' => wfScript( 'api' ) ) );
193193
194194 // Add other sources
195195 $this->addSource( $wgResourceLoaderSources );

Follow-up revisions

RevisionCommit summaryAuthorDate
r97173Merged revisions 97087,97091-97092,97094,97096-97098,97100-97101,97103,97136,...dantman16:19, 15 September 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r93247[ResourceLoader 2]: Add support for multiple loadScript sources...krinkle21:10, 26 July 2011

Status & tagging log