http://www.mediawiki.org/wiki/Special:Code/MediaWiki/81384
Revision: 81384
Author: reedy
Date: 2011-02-02 11:38:50 +0000 (Wed, 02 Feb 2011)
Log Message:
-----------
Couple more return hints
Swap and for &&
Modified Paths:
--------------
trunk/phase3/includes/MimeMagic.php
trunk/phase3/includes/filerepo/File.php
Modified: trunk/phase3/includes/MimeMagic.php
===================================================================
--- trunk/phase3/includes/MimeMagic.php 2011-02-02 11:38:25 UTC (rev 81383)
+++ trunk/phase3/includes/MimeMagic.php 2011-02-02 11:38:50 UTC (rev 81384)
@@ -309,6 +309,7 @@
/**
* Get an instance of this class
+ * @return MimeMagic
*/
static function &singleton() {
if ( !isset( self::$instance ) ) {
@@ -325,7 +326,7 @@
$r = @$this->mMimeToExt[$mime];
- if ( @!$r and isset( $this->mMimeTypeAliases[$mime] ) ) {
+ if ( @!$r && isset( $this->mMimeTypeAliases[$mime] ) ) {
$mime = $this->mMimeTypeAliases[$mime];
$r = @$this->mMimeToExt[$mime];
}
Modified: trunk/phase3/includes/filerepo/File.php
===================================================================
--- trunk/phase3/includes/filerepo/File.php 2011-02-02 11:38:25 UTC (rev
81383)
+++ trunk/phase3/includes/filerepo/File.php 2011-02-02 11:38:50 UTC (rev
81384)
@@ -626,6 +626,7 @@
/**
* Get a MediaHandler instance for this file
+ * @return MediaHandler
*/
function getHandler() {
if ( !isset( $this->handler ) ) {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
