Revert r44817 "Delay $wgContLang unstubbing"

Maintainability alert -- creates duplicate code which could become out of sync!

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 5d2bd26..4674712 100644 (file)
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -220,10 +220,13 @@ class WebRequest {
         */
        function getGPCVal( $arr, $name, $default ) {
                if( isset( $arr[$name] ) ) {
+                       global $wgContLang;
                        $data = $arr[$name];
                        if( isset( $_GET[$name] ) && !is_array( $data ) ) {
                                # Check for alternate/legacy character encoding.
-                               $data = $this->checkTitleEncoding( $data );
+                               if( isset( $wgContLang ) ) {
+                                       $data = $wgContLang->checkTitleEncoding( $data );
+                               }
                        }
                        $data = $this->normalizeUnicode( $data );
                        return $data;
@@ -231,20 +234,6 @@ class WebRequest {
                        return $default;
                }
        }
-       
-       protected function checkTitleEncoding( $s ) {
-               global $wgContLang;
-               if( !isset($wgContLang) ) return $s;
-               # Check for non-UTF-8 URLs
-               $ishigh = preg_match( '/[\x80-\xff]/', $s);
-               if( !$ishigh ) return $s;
-
-               $isutf8 = preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' .
-                       '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s );
-               if( $isutf8 ) return $s;
-               # Do the heavy lifting by unstubbing $wgContLang
-               return $wgContLang->iconv( $wgContLang->fallback8bitEncoding(), "utf-8", $s );
-       }
 
        /**
         * Fetch a scalar from the input or return $default if it's not set.