sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Accept and store translations data from the plugin and theme update check endpoints. 

Send site locale. Rename wp_get_installed_language_data() to wp_get_installed_translations().

see #18200.


git-svn-id: https://develop.svn.wordpress.org/trunk@25536 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2013-09-21 04:07:34 +00:00
parent 9fd23a65e7
commit 98f073272d
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/l10n.php
View File

@ -627,7 +627,7 @@ function get_available_languages( $dir = null ) {
}
/**
* Get installed language data.
* Get installed translations.
*
* Looks in the wp-content/languages directory for translations of
* plugins or themes.
@ -637,7 +637,7 @@ function get_available_languages( $dir = null ) {
* @param string $type What to search for. Accepts 'plugins', 'themes'.
* @return array Array of language data.
*/
function wp_get_installed_language_data( $type ) {
function wp_get_installed_translations( $type ) {
if ( $type !== 'themes' && $type !== 'plugins' )
return array();

36
src/wp-includes/update.php
View File

@ -146,7 +146,7 @@ function wp_update_plugins() {
require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
$plugins = get_plugins();
$languages = wp_get_installed_language_data( 'plugins' );
$translations = wp_get_installed_translations( 'plugins' );
$active = get_option( 'active_plugins', array() );
$current = get_site_transient( 'update_plugins' );
@ -202,7 +202,11 @@ function wp_update_plugins() {
$options = array(
'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3),
'body' => array( 'plugins' => json_encode( $to_send ), 'languages' => json_encode( $languages ) ),
'body' => array(
'plugins' => json_encode( $to_send ),
'translations' => json_encode( $translations ),
'locale' => json_encode( array( get_locale() ) ), // @todo filter.
),
'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
);
@ -215,12 +219,18 @@ function wp_update_plugins() {
if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) )
return false;
$response = json_decode( wp_remote_retrieve_body( $raw_response ) );
$response = json_decode( wp_remote_retrieve_body( $raw_response ), true );
foreach ( $response['plugins'] as &$plugin ) {
$plugin = (object) $plugin;
}
unset( $plugin );
if ( is_object( $response ) )
$new_option->response = (array) $response->plugins;
else
if ( is_array( $response ) ) {
$new_option->response = $response['plugins'];
$new_option->translations = $response['translations'];
} else {
$new_option->response = array();
}
set_site_transient( 'update_plugins', $new_option );
}
@ -245,7 +255,7 @@ function wp_update_themes() {
return false;
$installed_themes = wp_get_themes();
$languages = wp_get_installed_language_data( 'themes' );
$translations = wp_get_installed_translations( 'themes' );
$last_update = get_site_transient( 'update_themes' );
if ( ! is_object($last_update) )
@ -314,7 +324,11 @@ function wp_update_themes() {
$options = array(
'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3),
'body' => array( 'themes' => json_encode( $request ), 'languages' => json_encode( $languages ) ),
'body' => array(
'themes' => json_encode( $request ),
'translations' => json_encode( $translations ),
'locale' => json_encode( array( get_locale() ) ), // @todo filter.
),
'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
);
@ -333,8 +347,10 @@ function wp_update_themes() {
$response = json_decode( wp_remote_retrieve_body( $raw_response ), true );
if ( is_array( $response ) )
$new_update->response = $response['themes'];
if ( is_array( $response ) ) {
$new_update->response = $response['themes'];
$new_update->translations = $response['translations'];
}
set_site_transient( 'update_themes', $new_update );
}