| Index: trunk/phase3/includes/api/ApiBase.php |
| — | — | @@ -336,9 +336,9 @@ |
| 337 | 337 | $choices[] = $t; |
| 338 | 338 | } |
| 339 | 339 | } |
| 340 | | - $desc .= $paramPrefix . $nothingPrompt . $prompt; |
| 341 | | - $choicesstring = implode( ', ', $choices ); |
| 342 | | - $desc .= wordwrap( $choicesstring, 100, "\n " ); |
| | 340 | + $desc .= $paramPrefix . $nothingPrompt . $prompt; |
| | 341 | + $choicesstring = implode( ', ', $choices ); |
| | 342 | + $desc .= wordwrap( $choicesstring, 100, "\n " ); |
| 343 | 343 | } else { |
| 344 | 344 | switch ( $type ) { |
| 345 | 345 | case 'namespace': |
| Index: trunk/phase3/includes/api/ApiUpload.php |
| — | — | @@ -169,13 +169,11 @@ |
| 170 | 170 | |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | | - |
| 174 | 173 | // The following modules all require the filename parameter to be set |
| 175 | 174 | if ( is_null( $this->mParams['filename'] ) ) { |
| 176 | 175 | $this->dieUsageMsg( array( 'missingparam', 'filename' ) ); |
| 177 | 176 | } |
| 178 | 177 | |
| 179 | | - |
| 180 | 178 | if ( $this->mParams['sessionkey'] ) { |
| 181 | 179 | // Upload stashed in a previous request |
| 182 | 180 | $sessionData = $request->getSessionData( UploadBase::getSessionKeyName() ); |
| — | — | @@ -188,7 +186,6 @@ |
| 189 | 187 | $this->mParams['sessionkey'], |
| 190 | 188 | $sessionData[$this->mParams['sessionkey']] ); |
| 191 | 189 | |
| 192 | | - |
| 193 | 190 | } elseif ( isset( $this->mParams['file'] ) ) { |
| 194 | 191 | $this->mUpload = new UploadFromFile(); |
| 195 | 192 | $this->mUpload->initialize( |