Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-10 18:37:58 +01:00
Code Issues Projects Releases Wiki Activity

Plugins: In _get_plugin_data_markup_translate() remove the fallback to the "default" textdomain for Akismet.

Browse Source 
Akismet has its own language files since WordPress 3.9.

Props jrf.
Fixes #35436.
Built from https://develop.svn.wordpress.org/trunk@36283


git-svn-id: http://core.svn.wordpress.org/trunk@36250 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-01-13 13:56:26 +00:00
parent a51129c2a6
commit 0a6f311922
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/plugin.php
View File

@ -124,7 +124,7 @@ function _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup
load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) ); load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) );
} }
} }
} elseif ( in_array( basename( $plugin_file ), array( 'hello.php', 'akismet.php' ) ) ) { } elseif ( 'hello.php' == basename( $plugin_file ) ) {
$textdomain = 'default'; $textdomain = 'default';
} }
if ( $textdomain ) { if ( $textdomain ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-alpha-36282'; $wp_version = '4.5-alpha-36283';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.