Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/244246
Change subject: Stop using $wgScriptExtension, deprecated
......................................................................
Stop using $wgScriptExtension, deprecated
Change-Id: I7261e0abd4d474e0cad6ea3853a91dc102f2d1dd
---
M RenderingAPI.php
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection
refs/changes/46/244246/1
diff --git a/RenderingAPI.php b/RenderingAPI.php
index 4dd7830..319adbb 100644
--- a/RenderingAPI.php
+++ b/RenderingAPI.php
@@ -61,10 +61,10 @@
}
protected function doRender( array $params ) {
- global $wgScriptPath, $wgScriptExtension, $wgContLang;
+ global $wgScriptPath, $wgContLang;
$params['base_url'] = wfExpandUrl( $wgScriptPath, PROTO_CURRENT
);
- $params['script_extension'] = $wgScriptExtension;
+ $params['script_extension'] = '.php';
$params['language'] = $wgContLang->getCode();
return $this->makeRequest( 'render', $params );
}
@@ -79,13 +79,13 @@
* @return CollectionAPIResult
*/
public function postZip( $collection, $url ) {
- global $wgScriptPath, $wgScriptExtension;
+ global $wgScriptPath;
return $this->makeRequest( 'zip_post',
array(
'metabook' => $this->buildJSONCollection(
$collection ),
'base_url' => wfExpandUrl( $wgScriptPath,
PROTO_CURRENT ),
- 'script_extension' => $wgScriptExtension,
+ 'script_extension' => '.php',
'pod_api_url' => $url,
)
);
@@ -160,7 +160,7 @@
* @return string
*/
protected function buildJSONCollection( $collection ) {
- global $wgCanonicalServer, $wgScriptPath, $wgScriptExtension;
+ global $wgCanonicalServer, $wgScriptPath;
$result = array(
'type' => 'collection',
@@ -208,7 +208,7 @@
array(
'type' => 'wikiconf',
'baseurl' => $wgCanonicalServer . $wgScriptPath,
- 'script_extension' => $wgScriptExtension,
+ 'script_extension' => '.php',
'format' => 'nuwiki',
),
);
--
To view, visit https://gerrit.wikimedia.org/r/244246
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7261e0abd4d474e0cad6ea3853a91dc102f2d1dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
