r50292 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r50291‎ | r50292 | r50293 >
Date:23:51, 6 May 2009
Author:dale
Status:deferred
Tags:
Comment:
minor merge fixes
Modified paths:
  • /branches/new-upload/phase3/includes/Skin.php (modified) (history)
  • /branches/new-upload/phase3/includes/api/ApiUpload.php (modified) (history)

Diff [purge]

Index: branches/new-upload/phase3/includes/api/ApiUpload.php
@@ -41,7 +41,7 @@
4242 public function execute() {
4343 global $wgUser;
4444
45 - $this->getMain()->requestWriteMode();
 45+ $this->getMain()->isWriteMode();
4646 $this->mParams = $this->extractRequestParams();
4747 $request = $this->getMain()->getRequest();
4848
Index: branches/new-upload/phase3/includes/Skin.php
@@ -404,6 +404,12 @@
405405 'wgSeparatorTransformTable' => $compactSeparatorTransTable,
406406 'wgDigitTransformTable' => $compactDigitTransTable,
407407 );
 408+ //if on upload page output the extension list & js_upload
 409+ if( SpecialPage::resolveAlias( $wgTitle->getDBkey() ) == "Upload" ){
 410+ global $wgFileExtensions, $wgAjaxUploadInterface;
 411+ $vars['wgFileExtensions'] = $wgFileExtensions;
 412+ $vars['wgAjaxUploadInterface'] = $wgAjaxUploadInterface;
 413+ }
408414
409415 if( $wgUseAjax && $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false ) ){
410416 $vars['wgMWSuggestTemplate'] = SearchEngine::getMWSuggestTemplate();

Status & tagging log