From 59c610ec06b54cc05533d6d7ea8c8f5657815ea0 Mon Sep 17 00:00:00 2001 From: Mark Jaquith Date: Sat, 4 Nov 2006 05:20:39 +0000 Subject: [PATCH] make /languages/ directory default to /wp-content/languages/ with fallback to /wp-includes/languages/. Props Nazgul. fixes #3315 git-svn-id: https://develop.svn.wordpress.org/trunk@4446 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-settings.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/wp-settings.php b/wp-settings.php index 07661f4589..f4f284d4db 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -82,8 +82,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') )