| Index: trunk/phase3/maintenance/rebuildImages.php |
| — | — | @@ -33,6 +33,12 @@ |
| 34 | 34 | require_once( dirname( __FILE__ ) . '/Maintenance.php' ); |
| 35 | 35 | |
| 36 | 36 | class ImageBuilder extends Maintenance { |
| | 37 | + |
| | 38 | + /** |
| | 39 | + * @var DatabaseBase |
| | 40 | + */ |
| | 41 | + protected $dbw; |
| | 42 | + |
| 37 | 43 | function __construct() { |
| 38 | 44 | parent::__construct(); |
| 39 | 45 | |
| Index: trunk/phase3/includes/filerepo/File.php |
| — | — | @@ -1331,8 +1331,9 @@ |
| 1332 | 1332 | |
| 1333 | 1333 | function getRedirectedTitle() { |
| 1334 | 1334 | if ( $this->redirected ) { |
| 1335 | | - if ( !$this->redirectTitle ) |
| | 1335 | + if ( !$this->redirectTitle ) { |
| 1336 | 1336 | $this->redirectTitle = Title::makeTitle( NS_FILE, $this->redirected ); |
| | 1337 | + } |
| 1337 | 1338 | return $this->redirectTitle; |
| 1338 | 1339 | } |
| 1339 | 1340 | } |
| Index: trunk/phase3/includes/media/GIF.php |
| — | — | @@ -39,8 +39,8 @@ |
| 40 | 40 | */ |
| 41 | 41 | function getImageArea( $image, $width, $height ) { |
| 42 | 42 | $ser = $image->getMetadata(); |
| 43 | | - if ($ser) { |
| 44 | | - $metadata = unserialize($ser); |
| | 43 | + if ( $ser ) { |
| | 44 | + $metadata = unserialize( $ser ); |
| 45 | 45 | return $width * $height * $metadata['frameCount']; |
| 46 | 46 | } else { |
| 47 | 47 | return $width * $height; |
| — | — | @@ -53,7 +53,7 @@ |
| 54 | 54 | */ |
| 55 | 55 | function isAnimatedImage( $image ) { |
| 56 | 56 | $ser = $image->getMetadata(); |
| 57 | | - if ($ser) { |
| | 57 | + if ( $ser ) { |
| 58 | 58 | $metadata = unserialize($ser); |
| 59 | 59 | if( $metadata['frameCount'] > 1 ) { |
| 60 | 60 | return true; |
| Index: trunk/extensions/TitleBlacklist/TitleBlacklist.list.php |
| — | — | @@ -299,7 +299,7 @@ |
| 300 | 300 | } |
| 301 | 301 | |
| 302 | 302 | /** |
| 303 | | - * Check whether a user can perform the specified action |
| | 303 | + * Check whether a user can perform the specified action |
| 304 | 304 | * on the specified Title |
| 305 | 305 | * |
| 306 | 306 | * @param $title Title to check |
| — | — | @@ -404,7 +404,7 @@ |
| 405 | 405 | return null; |
| 406 | 406 | } |
| 407 | 407 | } |
| 408 | | - |
| | 408 | + |
| 409 | 409 | /** |
| 410 | 410 | * @returns This entry's regular expression |
| 411 | 411 | */ |
| — | — | @@ -432,7 +432,7 @@ |
| 433 | 433 | public function getCustomMessage() { |
| 434 | 434 | return isset( $this->mParams['errmsg'] ) ? $this->mParams['errmsg'] : null; |
| 435 | 435 | } |
| 436 | | - |
| | 436 | + |
| 437 | 437 | /** |
| 438 | 438 | * @returns The format version |
| 439 | 439 | */ |
| — | — | @@ -444,7 +444,7 @@ |
| 445 | 445 | * @param $v New version to set |
| 446 | 446 | */ |
| 447 | 447 | public function setFormatVersion( $v ) { $this->mFormatVersion = $v; } |
| 448 | | - |
| | 448 | + |
| 449 | 449 | /** |
| 450 | 450 | * Return the error message name for the blacklist entry. |
| 451 | 451 | * |