Index: wp-includes/update.php
===================================================================
--- wp-includes/update.php (revision 20311)
+++ wp-includes/update.php (working copy)
@@ -63,6 +63,8 @@
$wp_install = home_url( '/' );
}
+ $installed_languages = get_installed_language_files( 'core' );
+
$query = array(
'version' => $wp_version,
'php' => $php_version,
@@ -79,13 +81,14 @@
$options = array(
'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ),
'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
+ 'body' => array( 'installed_languages' => serialize( $installed_languages ) ),
'headers' => array(
'wp_install' => $wp_install,
'wp_blog' => home_url( '/' )
)
);
- $response = wp_remote_get($url, $options);
+ $response = wp_remote_post($url, $options);
if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
return false;
@@ -142,6 +145,10 @@
if ( !function_exists( 'get_plugins' ) )
require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+ // If we've just finished an update, get some fresh data
+ if ( 'upgrader_process_complete' == current_filter() )
+ wp_cache_delete( 'plugins', 'plugins' );
+
$plugins = get_plugins();
$active = get_option( 'active_plugins', array() );
$current = get_site_transient( 'update_plugins' );
@@ -153,6 +160,9 @@
// Check for update on a different schedule, depending on the page.
switch ( current_filter() ) {
+ case 'upgrader_process_complete':
+ $timeout = 0;
+ break;
case 'load-update-core.php' :
$timeout = 60; // 1 min
break;
@@ -193,11 +203,13 @@
$current->last_checked = time();
set_site_transient( 'update_plugins', $current );
+ $installed_languages = get_installed_language_files( 'plugins' );
+
$to_send = (object) compact('plugins', 'active');
$options = array(
'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3),
- 'body' => array( 'plugins' => serialize( $to_send ) ),
+ 'body' => array( 'plugins' => serialize( $to_send ), 'installed_languages' => serialize( $installed_languages ) ),
'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
);
@@ -235,6 +247,9 @@
if ( defined( 'WP_INSTALLING' ) )
return false;
+ //if ( 'upgrader_process_complete' == current_filter() )
+ // delete_some_magical_cache();
+
$installed_themes = wp_get_themes();
$last_update = get_site_transient( 'update_themes' );
if ( ! is_object($last_update) )
@@ -262,6 +277,9 @@
// Check for update on a different schedule, depending on the page.
switch ( current_filter() ) {
+ case 'upgrader_process_complete':
+ $timeout = 0;
+ break;
case 'load-update-core.php' :
$timeout = 60; // 1 min
break;
@@ -302,9 +320,11 @@
$last_update->last_checked = time();
set_site_transient( 'update_themes', $last_update );
+ $installed_languages = get_installed_language_files( 'themes' );
+
$options = array(
'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3),
- 'body' => array( 'themes' => serialize( $themes ) ),
+ 'body' => array( 'themes' => serialize( $themes ), 'installed_languages' => serialize( $installed_languages ) ),
'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
);
@@ -434,17 +454,20 @@
add_action( 'admin_init', '_maybe_update_core' );
add_action( 'wp_version_check', 'wp_version_check' );
+add_action( 'upgrader_process_complete', 'wp_version_check' );
add_action( 'load-plugins.php', 'wp_update_plugins' );
add_action( 'load-update.php', 'wp_update_plugins' );
add_action( 'load-update-core.php', 'wp_update_plugins' );
add_action( 'admin_init', '_maybe_update_plugins' );
add_action( 'wp_update_plugins', 'wp_update_plugins' );
+add_action( 'upgrader_process_complete', 'wp_update_plugins' ); // NOTE: This is used to force the updates to be done after upgrades, retrieving any new language file updates for the now installed plugin/theme. Has the side benefit that the Buble updates with the correct update number on next pageload!
add_action( 'load-themes.php', 'wp_update_themes' );
add_action( 'load-update.php', 'wp_update_themes' );
add_action( 'load-update-core.php', 'wp_update_themes' );
add_action( 'admin_init', '_maybe_update_themes' );
add_action( 'wp_update_themes', 'wp_update_themes' );
+add_action( 'upgrader_process_complete', 'wp_update_themes' );
add_action('init', 'wp_schedule_update_checks');
Index: wp-includes/l10n.php
===================================================================
--- wp-includes/l10n.php (revision 20311)
+++ wp-includes/l10n.php (working copy)
@@ -540,4 +540,65 @@
}
return $languages;
+}
+
+// Returns a list of translation files and their details.
+function get_installed_language_files( $type = false ) {
+ $language_files = array();
+
+ if ( ! is_dir( WP_LANG_DIR ) )
+ return array();
+
+ $dirs_to_check = array( WP_LANG_DIR );
+ foreach ( (array)glob( WP_LANG_DIR . '/*', GLOB_ONLYDIR) as $dir )
+ $dirs_to_check[] = $dir;
+
+ foreach ( $dirs_to_check as $dir ) {
+ foreach ( (array)glob( $dir . '/*.po') as $lang_file ) {
+ $lang_file = str_replace( trailingslashit(WP_LANG_DIR), '', $lang_file );
+
+ $file_data = get_translation_file_data( $lang_file );
+ $file_data['file'] = basename( $lang_file );
+ $file_data['type'] = dirname( $lang_file );
+ if ( '.' == $file_data['type'] )
+ $file_data['type'] = 'core';
+
+ if ( preg_match( '!(.*?)-?([a-z]{2}_[a-z]{2})?\.po!i', $file_data['file'], $lang_match ) ) {
+ $file_data['slug'] = $lang_match[1];
+ if ( isset( $lang_match[2] ) )
+ $file_data['language'] = $lang_match[2];
+ }
+
+ $language_files[] = $file_data;
+
+ }
+ }
+
+ // @TODO: Wasteful, Slot this into the above somewhere instead
+ if ( $type )
+ $language_files = wp_list_filter( $language_files, array( 'type' => $type ) );
+
+ return $language_files;
+}
+
+// retrieves the date/generator/project-id headers from a po file relative to WP_LANG_DIR
+function get_translation_file_data( $file ) {
+ // Just incase someone calls with the machine file instead of the textual version
+ $file = preg_replace( '!\.mo$!i', '.po', $file );
+
+ // Lets just assume that it's within the WP_LANG_DIR for now
+ // if we keep track of the loaded text domains later, we can probably include a lookup for the location of the files instead.
+ $data = get_file_data( WP_LANG_DIR . '/' . $file,
+ array(
+ 'date' => '"PO-Revision-Date',
+ 'generator' => '"X-Generator',
+ 'project-id' => '"Project-Id-Version'
+ )
+ );
+
+ // Strip the .po field endings off the values, which may, or may not, include a textual \n
+ foreach ( (array)$data as $key => $value )
+ $data[$key] = preg_replace( '!(\\\n)?"$!', '', $value);
+
+ return $data;
}
\ No newline at end of file
Index: wp-admin/includes/update.php
===================================================================
--- wp-admin/includes/update.php (revision 20311)
+++ wp-admin/includes/update.php (working copy)
@@ -301,3 +301,49 @@
echo "$msg
";
}
add_action( 'admin_notices', 'maintenance_nag' );
+
+// Retrieves a list of all language updates available.
+function get_language_updates() {
+
+ $updates = array();
+ foreach ( array( 'update_core' => 'core', 'update_plugins' => 'plugin', 'update_themes' => 'theme' ) as $transient => $type ) {
+
+ $transient = get_site_transient( $transient );
+ if ( empty( $transient->language_updates ) )
+ continue;
+
+ foreach ( (array)$transient->language_updates as $update ) {
+ if ( empty( $update->type ) )
+ $update->type = $type;
+
+ $updates[] = $update;
+ }
+ }
+
+ return $updates;
+
+/* // Expected content:
+ return array(
+ (object)array(
+ 'type' => 'core',
+ 'lang' => 'de_DE', // The language it is.. This isn't currently used anywhere
+ 'version' => '2012-02-18 08:48:04', // New Version - Nothing looks at this either.
+ 'package' => 'http://tools.dd32.id.au/wordpress/core-downloads/core-de_DE.zip'
+ ),
+ (object)array(
+ 'type' => 'plugin', // The type of the upgrade, 'plugin' or 'theme' will throw files into that folder, any other name (ie. 'core') is thrown into WP_LANG_DIR..
+ 'slug' => 'akismet', // not used.
+ 'for' => 'akismet/akismet.php', // again, not used yet.
+ 'lang' => 'de_DE',
+ 'version' => '2012-02-18 08:48:04',
+ 'package' => 'http://tools.dd32.id.au/wordpress/core-downloads/akismet-de_DE.zip'
+ ),
+ (object)array(
+ 'type' => 'theme',
+ 'slug' => 'twentytwelve',
+ 'lang' => 'de_DE',
+ 'version' => '2012-02-18 08:48:04',
+ 'package' => 'http://tools.dd32.id.au/wordpress/core-downloads/twentytwelve-de_DE.zip' // And no, this isn't a translation of 2012, I believe it's a out of date Core set.
+ )
+ );*/
+}
\ No newline at end of file
Index: wp-admin/includes/class-wp-upgrader.php
===================================================================
--- wp-admin/includes/class-wp-upgrader.php (revision 20311)
+++ wp-admin/includes/class-wp-upgrader.php (working copy)
@@ -165,7 +165,7 @@
function install_package($args = array()) {
global $wp_filesystem;
$defaults = array( 'source' => '', 'destination' => '', //Please always pass these
- 'clear_destination' => false, 'clear_working' => false,
+ 'clear_destination' => false, 'clear_working' => false, 'abort_if_destination_exists' => true,
'hook_extra' => array());
$args = wp_parse_args($args, $defaults);
@@ -224,7 +224,7 @@
return $removed;
else if ( ! $removed )
return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
- } elseif ( $wp_filesystem->exists($remote_destination) ) {
+ } elseif ( $abort_if_destination_exists && $wp_filesystem->exists($remote_destination) ) {
//If we're not clearing the destination folder and something exists there already, Bail.
//But first check to see if there are actually any files in the folder.
$_files = $wp_filesystem->dirlist($remote_destination);
@@ -272,6 +272,7 @@
$defaults = array( 'package' => '', //Please always pass this.
'destination' => '', //And this
'clear_destination' => false,
+ 'abort_if_destination_exists' => true, // Abort if the Destination directory exists, Pass clear_destination as false please
'clear_working' => true,
'is_multi' => false,
'hook_extra' => array() //Pass any extra $hook_extra args here, this will be passed to any hooked filters.
@@ -318,6 +319,7 @@
'source' => $working_dir,
'destination' => $destination,
'clear_destination' => $clear_destination,
+ 'abort_if_destination_exists' => $abort_if_destination_exists,
'clear_working' => $clear_working,
'hook_extra' => $hook_extra
) );
@@ -410,8 +412,7 @@
if ( ! $this->result || is_wp_error($this->result) )
return $this->result;
- // Force refresh of plugin update information
- delete_site_transient('update_plugins');
+ do_action( 'upgrader_process_complete', $this, 'install-plugin', $package );
return true;
}
@@ -454,8 +455,8 @@
if ( ! $this->result || is_wp_error($this->result) )
return $this->result;
- // Force refresh of plugin update information
- delete_site_transient('update_plugins');
+ do_action( 'upgrader_process_complete', $this, 'update-plugin', $plugin );
+
}
function bulk_upgrade($plugins) {
@@ -535,8 +536,7 @@
// Cleanup our hooks, in case something else does a upgrade on this connection.
remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'));
- // Force refresh of plugin update information
- delete_site_transient('update_plugins');
+ do_action( 'upgrader_process_complete', $this, 'bulk-upgrade-plugins', $plugins );
return $results;
}
@@ -761,8 +761,7 @@
if ( ! $this->result || is_wp_error($this->result) )
return $this->result;
- // Force refresh of theme update information
- delete_site_transient('update_themes');
+ do_action( 'upgrader_process_complete', $this, 'install-theme', $package );
return true;
}
@@ -807,8 +806,7 @@
if ( ! $this->result || is_wp_error($this->result) )
return $this->result;
- // Force refresh of theme update information
- delete_site_transient('update_themes');
+ do_action( 'upgrader_process_complete', $this, 'upgrade-theme', $theme );
return true;
}
@@ -894,8 +892,7 @@
remove_filter('upgrader_post_install', array(&$this, 'current_after'), 10, 2);
remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'), 10, 4);
- // Force refresh of theme update information
- delete_site_transient('update_themes');
+ do_action( 'upgrader_process_complete', $this, 'bulk-upgrade-themes', $themes );
return $results;
}
@@ -1064,11 +1061,139 @@
require(ABSPATH . 'wp-admin/includes/update-core.php');
+ // @TODO: Add the upgrader_process_complete bizzo here somewhere
return update_core($working_dir, $wp_dir);
}
}
+add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20, 3);
+class Language_Pack_Upgrader extends WP_Upgrader {
+
+ var $result;
+ var $bulk = true;
+
+ static function async_upgrade( $upgrader, $context, $package ) {
+ // Don't do Language updates on language updates on language updates..
+ if ( $upgrader instanceof Language_Pack_Upgrader )
+ return;
+
+ echo '';
+
+ $lp_upgrader = new Language_Pack_Upgrader( new Headerless_Skin() );
+
+ $lp_upgrader->upgrade();
+
+ echo '
';
+ }
+ function upgrade_strings() {
+ $this->strings['starting_upgrade'] = __( 'Some of your language files need updating, Sit tight for a few more seconds while we update them as well.' );
+ $this->strings['up_to_date'] = __('The language is up to date.'); // We need to silently skip this case
+ $this->strings['no_package'] = __('Update package not available.');
+ $this->strings['downloading_package'] = __('Downloading language update from %s…');
+ $this->strings['unpack_package'] = __('Unpacking the update…');
+ $this->strings['remove_old'] = __('Removing the old version of the language…');
+ $this->strings['remove_old_failed'] = __('Could not remove the old language.');
+ $this->strings['process_failed'] = __('Language update failed.');
+ $this->strings['process_success'] = __('Language updated successfully.');
+ }
+
+ function upgrade() {
+ return $this->bulk_upgrade();
+ }
+
+ function bulk_upgrade() {
+
+ $this->init();
+ $this->upgrade_strings();
+
+ $language_updates = get_language_updates();
+
+ if ( empty($language_updates) )
+ return true;
+
+ $this->skin->feedback( 'starting_upgrade' );
+
+ add_filter('upgrader_source_selection', array(&$this, 'check_package'), 10, 3 );
+
+ $this->skin->header();
+
+ // Connect to the Filesystem first.
+ $res = $this->fs_connect( array(WP_CONTENT_DIR, WP_LANG_DIR) );
+ if ( ! $res ) {
+ $this->skin->footer();
+ return false;
+ }
+
+ $results = array();
+
+ $this->update_count = count($language_updates);
+ $this->update_current = 0;
+ foreach ( $language_updates as $language_update ) {
+
+ $destination = WP_LANG_DIR;
+ if ( 'plugin' == $language_update->type ) {
+ $destination .= '/plugins';
+ } elseif ( 'theme' == $language_update->type ) {
+ $destination .= '/themes';
+ }
+
+ $this->update_current++;
+
+ $options = array(
+ 'package' => $language_update->package,
+ 'destination' => $destination,
+ 'clear_destination' => false,
+ 'abort_if_destination_exists' => false, // We expect the destination to exist.
+ 'clear_working' => true,
+ 'is_multi' => true,
+ 'hook_extra' => array(
+ 'language_update_type' => $language_update->type,
+ 'language_update' => $language_update,
+ )
+ );
+
+ $result = $this->run($options);
+
+ $results[] = $this->result;
+
+ // Prevent credentials auth screen from displaying multiple times
+ if ( false === $result )
+ break;
+ } //end foreach $language_updates
+
+ // Cleanup our hooks, in case something else does a upgrade on this connection.
+ remove_filter('upgrader_source_selection', array(&$this, 'check_package'), 10, 2 );
+
+ return $results;
+ }
+
+ function check_package( $source, $remote_source ) {
+ global $wp_filesystem;
+
+ if ( is_wp_error($source) )
+ return $source;
+
+ // Check the folder contains a valid language
+ $files = $wp_filesystem->dirlist( $remote_source );
+
+ // Check to see if a .po and .mo exist in the folder..
+ $po = $mo = false;
+ foreach ( (array)$files as $file => $filedata ) {
+ if ( '.po' == substr( $file, -3) )
+ $po = true;
+ elseif ( '.mo' == substr($file, -3) )
+ $mo = true;
+ }
+
+ if ( ! $mo || ! $po )
+ return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __( 'The language pack is missing either the .po or .mo files.' ) );
+
+ return $source;
+ }
+
+}
+
/**
* Generic Skin for the WordPress Upgrader classes. This skin is designed to be extended for specific purposes.
*
@@ -1157,6 +1282,20 @@
}
/**
+ * A basic Upgrader skin which doesn't have any Header/Footers
+ *
+ * @package WordPress
+ * @subpackage Upgrader
+ * @since 3.4.0
+ */
+class Headerless_Skin extends WP_Upgrader_Skin {
+ function before() {}
+ function after() {}
+ function header() {}
+ function footer() {}
+}
+
+/**
* Plugin Upgrader Skin for WordPress Plugin Upgrades.
*
* @TODO More Detailed docs, for methods as well.