| Index: trunk/phase3/maintenance/tests/ApiWatchTest.php |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | function doApiRequest( $params, $data = null ) { |
| 23 | 23 | $_SESSION = isset( $data[2] ) ? $data[2] : array(); |
| 24 | 24 | |
| 25 | | - $req = new FauxRequest( $params, true, $session ); |
| | 25 | + $req = new FauxRequest( $params, true, $_SESSION ); |
| 26 | 26 | $module = new ApiMain( $req, true ); |
| 27 | 27 | $module->execute(); |
| 28 | 28 | |
| Index: trunk/phase3/includes/media/GIF.php |
| — | — | @@ -14,7 +14,7 @@ |
| 15 | 15 | class GIFHandler extends BitmapHandler { |
| 16 | 16 | |
| 17 | 17 | function getMetadata( $image, $filename ) { |
| 18 | | - if ( !isset($image->parsedGIFMetadata) ) { |
| | 18 | + if ( !isset( $image->parsedGIFMetadata ) ) { |
| 19 | 19 | try { |
| 20 | 20 | $image->parsedGIFMetadata = GIFMetadataExtractor::getMetadata( $filename ); |
| 21 | 21 | } catch( Exception $e ) { |
| — | — | @@ -24,7 +24,7 @@ |
| 25 | 25 | } |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | | - return serialize($image->parsedGIFMetadata); |
| | 28 | + return serialize( $image->parsedGIFMetadata ); |
| 29 | 29 | |
| 30 | 30 | } |
| 31 | 31 | |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -1316,6 +1316,7 @@ |
| 1317 | 1317 | */ |
| 1318 | 1318 | private function checkPermissionHooks( $action, $user, $errors, $doExpensiveQueries, $short ) { |
| 1319 | 1319 | // Use getUserPermissionsErrors instead |
| | 1320 | + $result = ''; |
| 1320 | 1321 | if ( !wfRunHooks( 'userCan', array( &$this, &$user, $action, &$result ) ) ) { |
| 1321 | 1322 | return $result ? array() : array( array( 'badaccess-group0' ) ); |
| 1322 | 1323 | } |