| Index: trunk/extensions/Collection/Collection.php |
| — | — | @@ -46,9 +46,6 @@ |
| 47 | 47 | /** Maximum no. of articles in a collection */ |
| 48 | 48 | $wgCollectionMaxArticles = 500; |
| 49 | 49 | |
| 50 | | -/** Base URL for shared media MediaWiki */ |
| 51 | | -$wgSharedBaseURL = 'http://commons.wikimedia.org/w/'; |
| 52 | | - |
| 53 | 50 | /** License article */ |
| 54 | 51 | $wgLicenseArticle = 'MediaWiki:GFDL'; |
| 55 | 52 | |
| Index: trunk/extensions/Collection/README.txt |
| — | — | @@ -78,12 +78,6 @@ |
| 79 | 79 | |
| 80 | 80 | Default is 500. |
| 81 | 81 | |
| 82 | | - *$wgSharedBaseURL (string)* |
| 83 | | - Base URL (i.e. URL up to but not including ``index.php``/``api.php``) of a |
| 84 | | - MediaWiki used for shared files. |
| 85 | | - |
| 86 | | - Default is ``http://commons.mediawiki.org/w/`` |
| 87 | | - |
| 88 | 82 | *$wgLicenseArticle (string)* |
| 89 | 83 | Title of an article containing the full license text for articles in this |
| 90 | 84 | MediaWiki. For a Wikimedia Commons wiki this could be ``Wikipedia:GFDL``. |
| Index: trunk/extensions/Collection/Collection.body.php |
| — | — | @@ -485,13 +485,11 @@ |
| 486 | 486 | global $wgServer; |
| 487 | 487 | global $wgScriptPath; |
| 488 | 488 | global $wgLicenseArticle; |
| 489 | | - global $wgSharedBaseURL; |
| 490 | 489 | global $wgPDFTemplateBlacklist; |
| 491 | 490 | |
| 492 | 491 | $response = self::pdfServerCommand( 'pdf_generate', array( |
| 493 | 492 | 'metabook' => $this->buildJSONCollection( $collection ), |
| 494 | 493 | 'base_url' => $wgServer . $wgScriptPath, |
| 495 | | - 'shared_base_url' => $wgSharedBaseURL, |
| 496 | 494 | 'template_blacklist' => $wgPDFTemplateBlacklist, |
| 497 | 495 | 'license' => $wgLicenseArticle, |
| 498 | 496 | ) ); |
| — | — | @@ -627,7 +625,6 @@ |
| 628 | 626 | global $wgScriptPath; |
| 629 | 627 | global $wgOut; |
| 630 | 628 | global $wgLicenseArticle; |
| 631 | | - global $wgSharedBaseURL; |
| 632 | 629 | global $wgPDFTemplateBlacklist; |
| 633 | 630 | |
| 634 | 631 | $json = new Services_JSON(); |
| — | — | @@ -649,7 +646,6 @@ |
| 650 | 647 | $response = self::pdfServerCommand( 'zip_post', array( |
| 651 | 648 | 'metabook' => $this->buildJSONCollection( $_SESSION['wsCollection'] ), |
| 652 | 649 | 'base_url' => $wgServer . $wgScriptPath, |
| 653 | | - 'shared_base_url' => $wgSharedBaseURL, |
| 654 | 650 | 'template_blacklist' => $wgPDFTemplateBlacklist, |
| 655 | 651 | 'license' => $wgLicenseArticle, |
| 656 | 652 | 'post_url' => $postData->post_url, |
| Index: trunk/extensions/Collection/pdf-server/pdfserver.py |
| — | — | @@ -137,7 +137,6 @@ |
| 138 | 138 | if not base_url: |
| 139 | 139 | return self.error_response('base_url argument required') |
| 140 | 140 | |
| 141 | | - shared_base_url = self.form.getvalue('shared_base_url') |
| 142 | 141 | license = self.form.getvalue('license') |
| 143 | 142 | if not license: |
| 144 | 143 | return self.error_response('license argument required') |
| — | — | @@ -161,8 +160,6 @@ |
| 162 | 161 | '--progress', self.get_path(collection_id, self.progress_filename), |
| 163 | 162 | '--output', self.get_path(collection_id, self.pdf_filename), |
| 164 | 163 | ] |
| 165 | | - if shared_base_url: |
| 166 | | - args.extend(['--shared-baseurl', shared_base_url]) |
| 167 | 164 | if template_blacklist: |
| 168 | 165 | args.extend(['--template-blacklist', template_blacklist]) |
| 169 | 166 | |
| — | — | @@ -215,7 +212,6 @@ |
| 216 | 213 | base_url = self.form.getvalue('base_url') |
| 217 | 214 | if not base_url: |
| 218 | 215 | return self.error_response('base_url argument required') |
| 219 | | - shared_base_url = self.form.getvalue('shared_base_url') |
| 220 | 216 | license = self.form.getvalue('license') |
| 221 | 217 | if not license: |
| 222 | 218 | return self.error_response('license argument required') |
| — | — | @@ -238,8 +234,6 @@ |
| 239 | 235 | '--license', license, |
| 240 | 236 | '--posturl', post_url, |
| 241 | 237 | ] |
| 242 | | - if shared_base_url: |
| 243 | | - args.extend(['--shared-baseurl', shared_base_url]) |
| 244 | 238 | if template_blacklist: |
| 245 | 239 | args.extend(['--template-blacklist', template_blacklist]) |
| 246 | 240 | rc = subprocess.call(executable=mwzip_cmd, args=args) |