From: Sam Reed <reedy@users.mediawiki.org>
Date: Wed, 2 Feb 2011 11:38:50 +0000 (+0000)
Subject: Couple more return hints
X-Git-Tag: 1.31.0-rc.0~32259
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=9ecca4db510753c201917d30a8bcdc8a5659e430;p=lhc%2Fweb%2Fwiklou.git

Couple more return hints

Swap and for &&
---

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 ) ) {