From 898d3438c43dacf63fbf40e5048b4a41e1fa1fc2 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Thu, 2 Sep 2010 22:08:09 +0000 Subject: [PATCH] $result = '' in Title->checkPermissionHooks Fixup $session in ApiWatchTest --- includes/Title.php | 1 + includes/media/GIF.php | 4 ++-- maintenance/tests/ApiWatchTest.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/includes/Title.php b/includes/Title.php index a512878aba..a3b471811b 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -1316,6 +1316,7 @@ class Title { */ private function checkPermissionHooks( $action, $user, $errors, $doExpensiveQueries, $short ) { // Use getUserPermissionsErrors instead + $result = ''; if ( !wfRunHooks( 'userCan', array( &$this, &$user, $action, &$result ) ) ) { return $result ? array() : array( array( 'badaccess-group0' ) ); } diff --git a/includes/media/GIF.php b/includes/media/GIF.php index 70277c7892..b7c3f919ef 100644 --- a/includes/media/GIF.php +++ b/includes/media/GIF.php @@ -14,7 +14,7 @@ class GIFHandler extends BitmapHandler { function getMetadata( $image, $filename ) { - if ( !isset($image->parsedGIFMetadata) ) { + if ( !isset( $image->parsedGIFMetadata ) ) { try { $image->parsedGIFMetadata = GIFMetadataExtractor::getMetadata( $filename ); } catch( Exception $e ) { @@ -24,7 +24,7 @@ class GIFHandler extends BitmapHandler { } } - return serialize($image->parsedGIFMetadata); + return serialize( $image->parsedGIFMetadata ); } diff --git a/maintenance/tests/ApiWatchTest.php b/maintenance/tests/ApiWatchTest.php index c673c70377..e12e46d597 100644 --- a/maintenance/tests/ApiWatchTest.php +++ b/maintenance/tests/ApiWatchTest.php @@ -21,7 +21,7 @@ class ApiWatchTest extends ApiTestSetup { function doApiRequest( $params, $data = null ) { $_SESSION = isset( $data[2] ) ? $data[2] : array(); - $req = new FauxRequest( $params, true, $session ); + $req = new FauxRequest( $params, true, $_SESSION ); $module = new ApiMain( $req, true ); $module->execute(); -- 2.20.1