From bfd67cf8187a54163ae100d1728868720606fc74 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Fri, 7 Jan 2011 02:53:00 +0000 Subject: [PATCH] Remove some blank lines Spaces to tabs in ApiBase --- includes/api/ApiBase.php | 6 +++--- includes/api/ApiUpload.php | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index 9d14a9bbdf..7775c7d068 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -336,9 +336,9 @@ abstract class ApiBase { $choices[] = $t; } } - $desc .= $paramPrefix . $nothingPrompt . $prompt; - $choicesstring = implode( ', ', $choices ); - $desc .= wordwrap( $choicesstring, 100, "\n " ); + $desc .= $paramPrefix . $nothingPrompt . $prompt; + $choicesstring = implode( ', ', $choices ); + $desc .= wordwrap( $choicesstring, 100, "\n " ); } else { switch ( $type ) { case 'namespace': diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php index 15e2e65fc3..47e569f0a2 100644 --- a/includes/api/ApiUpload.php +++ b/includes/api/ApiUpload.php @@ -169,13 +169,11 @@ class ApiUpload extends ApiBase { } - // The following modules all require the filename parameter to be set if ( is_null( $this->mParams['filename'] ) ) { $this->dieUsageMsg( array( 'missingparam', 'filename' ) ); } - if ( $this->mParams['sessionkey'] ) { // Upload stashed in a previous request $sessionData = $request->getSessionData( UploadBase::getSessionKeyName() ); @@ -188,7 +186,6 @@ class ApiUpload extends ApiBase { $this->mParams['sessionkey'], $sessionData[$this->mParams['sessionkey']] ); - } elseif ( isset( $this->mParams['file'] ) ) { $this->mUpload = new UploadFromFile(); $this->mUpload->initialize( -- 2.20.1