Changeset 4699

Timestamp:

01/08/2007 12:11:06 AM (18 years ago)

Author:

ryan

Message:

Load locale specific php code in global context. fixes #3488

Location:

trunk

Files:

• wp-includes/locale.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/wp-includes/locale.php

@@ -88 +88 @@
         $this->meridiem['PM'] = __('PM');
 
-        $this->_load_locale_data();
-    }
+        // Import global locale vars set during inclusion of $locale.php.
+        foreach ( $this->locale_vars as $var ) {
+            if ( isset($GLOBALS[$var]) )
+                $this->$var = $GLOBALS[$var];
+        }
 
-    function _load_locale_data() {
-        $locale = get_locale();
-        $locale_file = ABSPATH . "wp-includes/languages/$locale.php";
-        if ( !file_exists($locale_file) )
-            return;
-
-        include($locale_file);
-
-        foreach ( $this->locale_vars as $var ) {
-            $this->$var = $$var;    
-        }
     }
 

trunk/wp-settings.php

@@ -243 +243 @@
 load_default_textdomain();
 
+$locale = get_locale();
+$locale_file = ABSPATH . LANGDIR . "/$locale.php";
+if ( is_readable($locale_file) )
+    require_once($locale_file);
+
 // Pull in locale data after loading text domain.
 require_once(ABSPATH . WPINC . '/locale.php');