diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-11-07 12:37:04 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-11-07 12:37:04 +0000 |
| commit | d510632e9f07cec9ac3de3b5dafc56bd58c81b8a (patch) | |
| tree | b4944ea6ceed3a73977f9edeae40f8174a4bab29 /wp-settings.php | |
| parent | 74e848ef222ada441de10e1db012988d1904b3ca (diff) | |
| download | wordpress-mu-d510632e9f07cec9ac3de3b5dafc56bd58c81b8a.tar.gz wordpress-mu-d510632e9f07cec9ac3de3b5dafc56bd58c81b8a.tar.xz wordpress-mu-d510632e9f07cec9ac3de3b5dafc56bd58c81b8a.zip | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@804 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
| -rw-r--r-- | wp-settings.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/wp-settings.php b/wp-settings.php index 54a24df..d82c124 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -90,8 +90,14 @@ if ( defined('WP_CACHE') ) require (ABSPATH . 'wp-content/advanced-cache.php'); define('WPINC', 'wp-includes'); -if ( !defined('LANGDIR') ) - define('LANGDIR', WPINC . '/languages'); // no leading slash, no trailing slash + +if ( !defined('LANGDIR') ) { + if ( file_exists(ABSPATH . 'wp-content/languages') && @is_dir(ABSPATH . 'wp-content/languages') ) + define('LANGDIR', 'wp-content/languages'); // no leading slash, no trailing slash + else + define('LANGDIR', WPINC . '/languages'); // no leading slash, no trailing slash +} + if ( !defined('PLUGINDIR') ) define('PLUGINDIR', 'wp-content/plugins'); // no leading slash, no trailing slash if ( file_exists(ABSPATH . 'wp-content/db.php') ) |