r40957 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r40956‎ | r40957 | r40958 >
Date:12:57, 17 September 2008
Author:jojo
Status:old
Tags:
Comment:
submit $wgScriptExtension to render server
Modified paths:
  • /trunk/extensions/Collection/Collection.body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Collection/Collection.body.php
@@ -620,6 +620,7 @@
621621 global $wgPDFTemplateBlacklist;
622622 global $wgServer;
623623 global $wgScriptPath;
 624+ global $wgScriptExtension;
624625
625626 if ( !$writer ) {
626627 $writer = 'rl';
@@ -628,6 +629,7 @@
629630 $response = self::mwServeCommand( 'render', array(
630631 'metabook' => $this->buildJSONCollection( $collection ),
631632 'base_url' => $wgServer . $wgScriptPath,
 633+ 'script_extension' => $wgScriptExtension,
632634 'template_blacklist' => $wgPDFTemplateBlacklist,
633635 'template_exclusion_category' => $wgCollectionTemplateExclusionCategory,
634636 'writer' => $writer,
@@ -654,6 +656,7 @@
655657 global $wgRequest;
656658 global $wgServer;
657659 global $wgScriptPath;
 660+ global $wgScriptExtension;
658661
659662 $collectionID = $wgRequest->getVal( 'collection_id', '' );
660663 $writer = $wgRequest->getVal( 'writer', 'rl' );
@@ -661,6 +664,7 @@
662665 $response = self::mwServeCommand( 'render', array(
663666 'collection_id' => $collectionID,
664667 'base_url' => $wgServer . $wgScriptPath,
 668+ 'script_extension' => $wgScriptExtension,
665669 'template_blacklist' => $wgPDFTemplateBlacklist,
666670 'template_exclusion_category' => $wgCollectionTemplateExclusionCategory,
667671 'writer' => $writer,
@@ -800,6 +804,7 @@
801805 function postZIP( $partner ) {
802806 global $wgServer;
803807 global $wgScriptPath;
 808+ global $wgScriptExtension;
804809 global $wgOut;
805810 global $wgPDFTemplateBlacklist;
806811 global $wgCollectionTemplateExclusionCategory;
@@ -814,6 +819,7 @@
815820 $response = self::mwServeCommand( 'zip_post', array(
816821 'metabook' => $this->buildJSONCollection( $_SESSION['wsCollection'] ),
817822 'base_url' => $wgServer . $wgScriptPath,
 823+ 'script_extension' => $wgScriptExtension,
818824 'template_blacklist' => $wgPDFTemplateBlacklist,
819825 'template_exclusion_category' => $wgCollectionTemplateExclusionCategory,
820826 'pod_api_url' => $this->mPODPartners[$partner]['posturl'],