Respect $wgScriptExtension in SearchEngine::getOpenSearchTemplate() and SearchEngine...

[lhc/web/wiklou.git] / includes / StubObject.php

diff --git a/includes/StubObject.php b/includes/StubObject.php
index 391a9f1..d1055e1 100644 (file)
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -152,11 +152,13 @@ class StubUserLang extends StubObject {
                $code = strtolower( $code );
 
                # Validate $code
-               if( empty( $code ) || !preg_match( '/^[a-z-]+$/', $code ) || ( $code === 'qqq' ) ) {
+               if( empty( $code ) || !Language::isValidCode( $code ) || ( $code === 'qqq' ) ) {
                        wfDebug( "Invalid user language code\n" );
                        $code = $wgLanguageCode;
                }
 
+               wfRunHooks( 'UserGetLanguageObject', array( $wgUser, &$code ) );
+
                if( $code === $wgLanguageCode ) {
                        return $wgContLang;
                } else {