Couple more return hints

Swap and for &&

diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index 018f601..62c11c8 100644 (file)
--- 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 f5ba3a4..ae4d2fe 100644 (file)
--- 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 ) ) {