Merge "Use gettype only for debugging text"

diff --combined includes/media/Exif.php
index 1767180,e0b75c8..5664d59
--- 1/includes/media/Exif.php
--- 2/includes/media/Exif.php
+++ b/includes/media/Exif.php
@@@ -363,7 -363,7 +363,7 @@@ class Exif 
         * As an alternative approach, some of this could be done in the validate phase
         * if we make up our own types like Exif::DATE.
         */
 -      function collapseData( ) {
 +      function collapseData() {
  
                $this->exifGPStoNumber( 'GPSLatitude' );
                $this->exifGPStoNumber( 'GPSDestLatitude' );
@@@ -545,7 -545,7 +545,7 @@@
         *
         * @deprecated since 1.18
         */
 -      function makeFormattedData( ) {
 +      function makeFormattedData() {
                wfDeprecated( __METHOD__, '1.18' );
                $this->mFormattedExifData = FormatMetadata::getFormattedData(
                        $this->mFilteredExifData );
@@@ -677,7 -677,7 +677,7 @@@
         */
        private function isRational( $in ) {
                $m = array();
 -              if ( !is_array( $in ) && @preg_match( '/^(\d+)\/(\d+[1-9]|[1-9]\d*)$/', $in, $m ) ) { # Avoid division by zero
 +              if ( !is_array( $in ) && preg_match( '/^(\d+)\/(\d+[1-9]|[1-9]\d*)$/', $in, $m ) ) { # Avoid division by zero
                        return $this->isLong( $m[1] ) && $this->isLong( $m[2] );
                } else {
                        $this->debug( $in, __FUNCTION__, 'fed a non-fraction value' );
@@@ -808,7 -808,7 +808,7 @@@
                }
                $type = gettype( $in );
                $class = ucfirst( __CLASS__ );
-               if ( $type === 'array' ) {
+               if ( is_array( $in ) ) {
                        $in = print_r( $in, true );
                }
  

diff --combined languages/Language.php
index 1c52da5,50d8676..9641a89
--- 1/languages/Language.php
--- 2/languages/Language.php
+++ b/languages/Language.php
@@@ -349,12 -349,12 +349,12 @@@ class Language 
        public static function isValidBuiltInCode( $code ) {
  
                if ( !is_string( $code ) ) {
-                       $type = gettype( $code );
-                       if ( $type === 'object' ) {
+                       if ( is_object( $code ) ) {
                                $addmsg = " of class " . get_class( $code );
                        } else {
                                $addmsg = '';
                        }
+                       $type = gettype( $code );
                        throw new MWException( __METHOD__ . " must be passed a string, $type given$addmsg" );
                }
  
@@@ -531,7 -531,7 +531,7 @@@
        /**
         * Resets all of the namespace caches. Mainly used for testing
         */
 -      public function resetNamespaces( ) {
 +      public function resetNamespaces() {
                $this->namespaceNames = null;
                $this->mNamespaceIds = null;
                $this->namespaceAliases = null;