http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72236
Revision: 72236
Author: reedy
Date: 2010-09-02 22:08:09 +0000 (Thu, 02 Sep 2010)
Log Message:
-----------
$result = '' in Title->checkPermissionHooks
Fixup $session in ApiWatchTest
Modified Paths:
--------------
trunk/phase3/includes/Title.php
trunk/phase3/includes/media/GIF.php
trunk/phase3/maintenance/tests/ApiWatchTest.php
Modified: trunk/phase3/includes/Title.php
===================================================================
--- trunk/phase3/includes/Title.php 2010-09-02 21:56:14 UTC (rev 72235)
+++ trunk/phase3/includes/Title.php 2010-09-02 22:08:09 UTC (rev 72236)
@@ -1316,6 +1316,7 @@
*/
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' ) );
}
Modified: trunk/phase3/includes/media/GIF.php
===================================================================
--- trunk/phase3/includes/media/GIF.php 2010-09-02 21:56:14 UTC (rev 72235)
+++ trunk/phase3/includes/media/GIF.php 2010-09-02 22:08:09 UTC (rev 72236)
@@ -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 @@
}
}
- return serialize($image->parsedGIFMetadata);
+ return serialize( $image->parsedGIFMetadata );
}
Modified: trunk/phase3/maintenance/tests/ApiWatchTest.php
===================================================================
--- trunk/phase3/maintenance/tests/ApiWatchTest.php 2010-09-02 21:56:14 UTC
(rev 72235)
+++ trunk/phase3/maintenance/tests/ApiWatchTest.php 2010-09-02 22:08:09 UTC
(rev 72236)
@@ -21,7 +21,7 @@
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();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
