| Index: trunk/extensions/WikiEditor/WikiEditor.hooks.php |
| — | — | @@ -208,8 +208,8 @@ |
| 209 | 209 | * |
| 210 | 210 | * Adds WikiEditor-releated items to the preferences |
| 211 | 211 | * |
| 212 | | - * @param $out User current user |
| 213 | | - * @param $skin array list of default user preference controls |
| | 212 | + * @param $user User current user |
| | 213 | + * @param $defaultPreferences array list of default user preference controls |
| 214 | 214 | */ |
| 215 | 215 | public static function getPreferences( $user, &$defaultPreferences ) { |
| 216 | 216 | global $wgWikiEditorFeatures; |
| Index: trunk/extensions/UploadWizard/UploadWizardTutorial.php |
| — | — | @@ -60,7 +60,8 @@ |
| 61 | 61 | // put it into a div of appropriate dimensions. |
| 62 | 62 | |
| 63 | 63 | // n.b. File::transform() returns false if failed, MediaTransformOutput otherwise |
| 64 | | - if ( $thumbnailImage = $tutorialFile->transform( array( 'width' => self::WIDTH_PX ) ) ) { |
| | 64 | + $thumbnailImage = $tutorialFile->transform( array( 'width' => self::WIDTH_PX ) ); |
| | 65 | + if ( $thumbnailImage ) { |
| 65 | 66 | $tutorialHtml = self::getImageHtml( $thumbnailImage ); |
| 66 | 67 | } else { |
| 67 | 68 | $error = 'cannot-transform'; |