From befa36c3792404a38d06e217b675098273d25dd4 Mon Sep 17 00:00:00 2001 From: westi Date: Sat, 2 Jan 2010 10:28:05 +0000 Subject: [PATCH] Mark 2nd param of load_plugin_textdomain() as deprecated. Fixes #11679 props nacin. git-svn-id: http://svn.automattic.com/wordpress/trunk@12594 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/l10n.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index 88b13efbd..4501176d8 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -369,13 +369,15 @@ function load_default_textdomain() { function load_plugin_textdomain( $domain, $abs_rel_path = false, $plugin_rel_path = false ) { $locale = get_locale(); - if ( false !== $plugin_rel_path ) + if ( false !== $plugin_rel_path ) { $path = WP_PLUGIN_DIR . '/' . trim( $plugin_rel_path, '/' ); - else if ( false !== $abs_rel_path ) + } else if ( false !== $abs_rel_path ) { + _deprecated_argument( __FUNCTION__, '2.7' ); $path = ABSPATH . trim( $abs_rel_path, '/' ); - else + } else { $path = WP_PLUGIN_DIR; - + } + $mofile = $path . '/'. $domain . '-' . $locale . '.mo'; return load_textdomain( $domain, $mofile ); }