Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

$result = '' in Title->checkPermissionHooks

Browse source 
Fixup $session in ApiWatchTest
This commit is contained in:
Sam Reed 2010-09-02 22:08:09 +00:00
parent c5ba4b459f
commit 898d3438c4
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
includes/Title.php
View file

@ -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' ) );
}

4
includes/media/GIF.php
View file

@ -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 );
}

2
maintenance/tests/ApiWatchTest.php
View file

@ -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();