Changeset 17575

Timestamp:

03/31/2011 08:11:30 AM (14 years ago)

Author:

dd32

Message:

Default WP_LANG_DIR to WP_CONTENT_DIR/languages when wp-includes/languages/ doesn't exist. Fixes #17006

File:

• trunk/wp-includes/load.php (modified) (2 diffs)

trunk/wp-includes/load.php

@@ -284 +284 @@
  * To set directory manually, define <code>WP_LANG_DIR</code> in wp-config.php.
  *
- * First looks for language folder in WP_CONTENT_DIR and uses that folder if it
- * exists. Or it uses the "languages" folder in WPINC.
+ * If the language directory exists within WP_CONTENT_DIR that is used
+ * Otherwise if the language directory exists within WPINC, that's used
+ * Finally, If neither of the preceeding directories is found,
+ * WP_CONTENT_DIR/languages is used.
  *
  * The WP_LANG_DIR constant was introduced in 2.1.0.
@@ -294 +296 @@
 function wp_set_lang_dir() {
     if ( !defined( 'WP_LANG_DIR' ) ) {
-        if ( file_exists( WP_CONTENT_DIR . '/languages' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) ) {
+        if ( file_exists( WP_CONTENT_DIR . '/languages' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) || !@is_dir(ABSPATH . WPINC . '/languages') ) {
             define( 'WP_LANG_DIR', WP_CONTENT_DIR . '/languages' ); // no leading slash, no trailing slash, full path, not relative to ABSPATH
             if ( !defined( 'LANGDIR' ) ) {