WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
westi 2010-01-02 10:28:05 +00:00
parent 84f90c704a
commit befa36c379
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/l10n.php
View File

@ -369,13 +369,15 @@ function load_default_textdomain() {
function load_plugin_textdomain( $domain, $abs_rel_path = false, $plugin_rel_path = false ) { function load_plugin_textdomain( $domain, $abs_rel_path = false, $plugin_rel_path = false ) {
$locale = get_locale(); $locale = get_locale();
if ( false !== $plugin_rel_path ) if ( false !== $plugin_rel_path ) {
$path = WP_PLUGIN_DIR . '/' . trim( $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, '/' ); $path = ABSPATH . trim( $abs_rel_path, '/' );
else } else {
$path = WP_PLUGIN_DIR; $path = WP_PLUGIN_DIR;
}
$mofile = $path . '/'. $domain . '-' . $locale . '.mo'; $mofile = $path . '/'. $domain . '-' . $locale . '.mo';
return load_textdomain( $domain, $mofile ); return load_textdomain( $domain, $mofile );
} }