From 9ecca4db510753c201917d30a8bcdc8a5659e430 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Wed, 2 Feb 2011 11:38:50 +0000 Subject: [PATCH] Couple more return hints Swap and for && --- includes/MimeMagic.php | 3 ++- includes/filerepo/File.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php index 018f601df3..62c11c8788 100644 --- a/includes/MimeMagic.php +++ b/includes/MimeMagic.php @@ -309,6 +309,7 @@ class MimeMagic { /** * Get an instance of this class + * @return MimeMagic */ static function &singleton() { if ( !isset( self::$instance ) ) { @@ -325,7 +326,7 @@ class MimeMagic { $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]; } diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php index f5ba3a4533..ae4d2fed1a 100644 --- a/includes/filerepo/File.php +++ b/includes/filerepo/File.php @@ -626,6 +626,7 @@ abstract class File { /** * Get a MediaHandler instance for this file + * @return MediaHandler */ function getHandler() { if ( !isset( $this->handler ) ) { -- 2.20.1