$result = '' in Title->checkPermissionHooks

Fixup $session in ApiWatchTest

diff --git a/includes/Title.php b/includes/Title.php
index a512878..a3b4718 100644 (file)
--- 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 70277c7..b7c3f91 100644 (file)
--- 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 c673c70..e12e46d 100644 (file)
--- 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();