| Index: branches/uploadwizard/phase3/includes/upload/UploadBase.php |
| — | — | @@ -623,7 +623,7 @@ |
| 624 | 624 | * If the user does not supply all necessary information in the first upload form submission (either by accident or |
| 625 | 625 | * by design) then we may want to stash the file temporarily, get more information, and publish the file later. |
| 626 | 626 | * |
| 627 | | - * This method will stash a file in a temporary directory for later processing, and save the necessary descriptive info |
| | 627 | + * This method will stash a file in a temporary directory for later processing, and save the necessary descriptive info |
| 628 | 628 | * into the user's session. |
| 629 | 629 | * This method returns the file object, which also has a 'sessionKey' property which can be passed through a form or |
| 630 | 630 | * API request to find this stashed file again. |
| Index: branches/uploadwizard/phase3/includes/upload/SessionStash.php |
| — | — | @@ -128,7 +128,7 @@ |
| 129 | 129 | $error = array( 'unknown', 'no error recorded' ); |
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | | - throw new SessionStashFileException( "error storing file in '$path': " . join( '; ', $error ) ); |
| | 132 | + throw new SessionStashFileException( "error storing file in '$path': " . implode( '; ', $error ) ); |
| 133 | 133 | } |
| 134 | 134 | $stashPath = $status->value; |
| 135 | 135 | |
| Index: branches/uploadwizard/phase3/includes/api/ApiQueryImageInfo.php |
| — | — | @@ -185,11 +185,11 @@ |
| 186 | 186 | */ |
| 187 | 187 | public function getScale( $params ) { |
| 188 | 188 | $p = $this->getModulePrefix(); |
| 189 | | - if ( $params['urlheight'] != - 1 && $params['urlwidth'] == - 1 ) { |
| | 189 | + if ( $params['urlheight'] != -1 && $params['urlwidth'] == -1 ) { |
| 190 | 190 | $this->dieUsage( "${p}urlheight cannot be used without {$p}urlwidth", "{$p}urlwidth" ); |
| 191 | 191 | } |
| 192 | 192 | |
| 193 | | - if ( $params['urlwidth'] != - 1 ) { |
| | 193 | + if ( $params['urlwidth'] != -1 ) { |
| 194 | 194 | $scale = array(); |
| 195 | 195 | $scale['width'] = $params['urlwidth']; |
| 196 | 196 | $scale['height'] = $params['urlheight']; |
| — | — | @@ -335,11 +335,11 @@ |
| 336 | 336 | ), |
| 337 | 337 | 'urlwidth' => array( |
| 338 | 338 | ApiBase::PARAM_TYPE => 'integer', |
| 339 | | - ApiBase::PARAM_DFLT => - 1 |
| | 339 | + ApiBase::PARAM_DFLT => -1 |
| 340 | 340 | ), |
| 341 | 341 | 'urlheight' => array( |
| 342 | 342 | ApiBase::PARAM_TYPE => 'integer', |
| 343 | | - ApiBase::PARAM_DFLT => - 1 |
| | 343 | + ApiBase::PARAM_DFLT => -1 |
| 344 | 344 | ), |
| 345 | 345 | 'continue' => null, |
| 346 | 346 | ); |