WordPress 3.3.2-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / update.php

diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php
index 0d0e6604d30adb23bf960ecf5954083d008ae8df..f82402457f87e0df023aea0ac8f8a107bd950f4d 100644 (file)
--- a/wp-admin/includes/update.php
+++ b/wp-admin/includes/update.php
@@ -26,14 +26,14 @@ function get_preferred_from_update_core() {
  * Get available core updates
  *
  * @param array $options Set $options['dismissed'] to true to show dismissed upgrades too,
  * Get available core updates
  *
  * @param array $options Set $options['dismissed'] to true to show dismissed upgrades too,

- *     set $options['available'] to false to skip not-dimissed updates.
+ *     set $options['available'] to false to skip not-dismissed updates.

  * @return array Array of the update objects
  */
 function get_core_updates( $options = array() ) {
        $options = array_merge( array('available' => true, 'dismissed' => false ), $options );
  * @return array Array of the update objects
  */
 function get_core_updates( $options = array() ) {
        $options = array_merge( array('available' => true, 'dismissed' => false ), $options );

-       $dismissed = get_option( 'dismissed_update_core' );
+       $dismissed = get_site_option( 'dismissed_update_core' );

        if ( !is_array( $dismissed ) ) $dismissed = array();
        if ( !is_array( $dismissed ) ) $dismissed = array();

-       $from_api = get_transient( 'update_core' );
+       $from_api = get_site_transient( 'update_core' );

        if ( empty($from_api) )
                return false;
        if ( !isset( $from_api->updates ) || !is_array( $from_api->updates ) ) return false;
        if ( empty($from_api) )
                return false;
        if ( !isset( $from_api->updates ) || !is_array( $from_api->updates ) ) return false;


@@ -57,21 +57,21 @@ function get_core_updates( $options = array() ) {
 }
 
 function dismiss_core_update( $update ) {
 }
 
 function dismiss_core_update( $update ) {

-       $dismissed = get_option( 'dismissed_update_core' );
+       $dismissed = get_site_option( 'dismissed_update_core' );

        $dismissed[ $update->current.'|'.$update->locale ] = true;
        $dismissed[ $update->current.'|'.$update->locale ] = true;

-       return update_option( 'dismissed_update_core', $dismissed );
+       return update_site_option( 'dismissed_update_core', $dismissed );

 }
 
 function undismiss_core_update( $version, $locale ) {
 }
 
 function undismiss_core_update( $version, $locale ) {

-       $dismissed = get_option( 'dismissed_update_core' );
+       $dismissed = get_site_option( 'dismissed_update_core' );

        $key = $version.'|'.$locale;
        if ( !isset( $dismissed[$key] ) ) return false;
        unset( $dismissed[$key] );
        $key = $version.'|'.$locale;
        if ( !isset( $dismissed[$key] ) ) return false;
        unset( $dismissed[$key] );

-       return update_option( 'dismissed_update_core', $dismissed );
+       return update_site_option( 'dismissed_update_core', $dismissed );

 }
 
 function find_core_update( $version, $locale ) {
 }
 
 function find_core_update( $version, $locale ) {

-       $from_api = get_transient( 'update_core' );
+       $from_api = get_site_transient( 'update_core' );

        if ( !is_array( $from_api->updates ) ) return false;
        $updates = $from_api->updates;
        foreach($updates as $update) {
        if ( !is_array( $from_api->updates ) ) return false;
        $updates = $from_api->updates;
        foreach($updates as $update) {


@@ -82,7 +82,7 @@ function find_core_update( $version, $locale ) {
 }
 
 function core_update_footer( $msg = '' ) {
 }
 
 function core_update_footer( $msg = '' ) {

-       if ( !current_user_can('manage_options') )
+       if ( !current_user_can('update_core') )

                return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] );
 
        $cur = get_preferred_from_update_core();
                return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] );
 
        $cur = get_preferred_from_update_core();


@@ -97,14 +97,12 @@ function core_update_footer( $msg = '' ) {
 
        switch ( $cur->response ) {
        case 'development' :
 
        switch ( $cur->response ) {
        case 'development' :

-               return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], 'update-core.php');
+               return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], network_admin_url( 'update-core.php' ) );

        break;
 
        case 'upgrade' :
        break;
 
        case 'upgrade' :

-               if ( current_user_can('manage_options') ) {
-                       return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', 'update-core.php', $cur->current);
-                       break;
-               }
+               return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', network_admin_url( 'update-core.php' ), $cur->current);
+       break;

 
        case 'latest' :
        default :
 
        case 'latest' :
        default :


@@ -115,6 +113,9 @@ function core_update_footer( $msg = '' ) {
 add_filter( 'update_footer', 'core_update_footer' );
 
 function update_nag() {
 add_filter( 'update_footer', 'core_update_footer' );
 
 function update_nag() {

+       if ( is_multisite() && !current_user_can('update_core') )
+               return false;
+

        global $pagenow;
 
        if ( 'update-core.php' == $pagenow )
        global $pagenow;
 
        if ( 'update-core.php' == $pagenow )


@@ -125,22 +126,25 @@ function update_nag() {
        if ( ! isset( $cur->response ) || $cur->response != 'upgrade' )
                return false;
 
        if ( ! isset( $cur->response ) || $cur->response != 'upgrade' )
                return false;
 

-       if ( current_user_can('manage_options') )
-               $msg = sprintf( __('WordPress %1$s is available! <a href="%2$s">Please update now</a>.'), $cur->current, 'update-core.php' );
-       else
-               $msg = sprintf( __('WordPress %1$s is available! Please notify the site administrator.'), $cur->current );
-
-       echo "<div id='update-nag'>$msg</div>";
+       if ( current_user_can('update_core') ) {
+               $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s">Please update now</a>.'), $cur->current, network_admin_url( 'update-core.php' ) );
+       } else {
+               $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! Please notify the site administrator.'), $cur->current );
+       }
+       echo "<div class='update-nag'>$msg</div>";

 }
 add_action( 'admin_notices', 'update_nag', 3 );
 
 // Called directly from dashboard
 function update_right_now_message() {
 }
 add_action( 'admin_notices', 'update_nag', 3 );
 
 // Called directly from dashboard
 function update_right_now_message() {

-       $cur = get_preferred_from_update_core();
-

        $msg = sprintf( __('You are using <span class="b">WordPress %s</span>.'), $GLOBALS['wp_version'] );
        $msg = sprintf( __('You are using <span class="b">WordPress %s</span>.'), $GLOBALS['wp_version'] );

-       if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('manage_options') )
-               $msg .= " <a href='update-core.php' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
+
+       if ( current_user_can('update_core') ) {
+               $cur = get_preferred_from_update_core();
+
+               if ( isset( $cur->response ) && $cur->response == 'upgrade'  )
+                       $msg .= " <a href='" . network_admin_url( 'update-core.php' ) . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
+       }

 
        echo "<span id='wp-version-message'>$msg</span>";
 }
 
        echo "<span id='wp-version-message'>$msg</span>";
 }


@@ -148,7 +152,7 @@ function update_right_now_message() {
 function get_plugin_updates() {
        $all_plugins = get_plugins();
        $upgrade_plugins = array();
 function get_plugin_updates() {
        $all_plugins = get_plugins();
        $upgrade_plugins = array();

-       $current = get_transient( 'update_plugins' );
+       $current = get_site_transient( 'update_plugins' );

        foreach ( (array)$all_plugins as $plugin_file => $plugin_data) {
                if ( isset( $current->response[ $plugin_file ] ) ) {
                        $upgrade_plugins[ $plugin_file ] = (object) $plugin_data;
        foreach ( (array)$all_plugins as $plugin_file => $plugin_data) {
                if ( isset( $current->response[ $plugin_file ] ) ) {
                        $upgrade_plugins[ $plugin_file ] = (object) $plugin_data;


@@ -160,7 +164,10 @@ function get_plugin_updates() {
 }
 
 function wp_plugin_update_rows() {
 }
 
 function wp_plugin_update_rows() {

-       $plugins = get_transient( 'update_plugins' );
+       if ( !current_user_can('update_plugins' ) )
+               return;
+
+       $plugins = get_site_transient( 'update_plugins' );

        if ( isset($plugins->response) && is_array($plugins->response) ) {
                $plugins = array_keys( $plugins->response );
                foreach( $plugins as $plugin_file ) {
        if ( isset($plugins->response) && is_array($plugins->response) ) {
                $plugins = array_keys( $plugins->response );
                foreach( $plugins as $plugin_file ) {


@@ -171,7 +178,7 @@ function wp_plugin_update_rows() {
 add_action( 'admin_init', 'wp_plugin_update_rows' );
 
 function wp_plugin_update_row( $file, $plugin_data ) {
 add_action( 'admin_init', 'wp_plugin_update_rows' );
 
 function wp_plugin_update_row( $file, $plugin_data ) {

-       $current = get_transient( 'update_plugins' );
+       $current = get_site_transient( 'update_plugins' );

        if ( !isset( $current->response[ $file ] ) )
                return false;
 
        if ( !isset( $current->response[ $file ] ) )
                return false;
 


@@ -180,23 +187,27 @@ function wp_plugin_update_row( $file, $plugin_data ) {
        $plugins_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array());
        $plugin_name = wp_kses( $plugin_data['Name'], $plugins_allowedtags );
 
        $plugins_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array());
        $plugin_name = wp_kses( $plugin_data['Name'], $plugins_allowedtags );
 

-       $details_url = admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '&TB_iframe=true&width=600&height=800');
+       $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '&TB_iframe=true&width=600&height=800');

 
 

-       echo '<tr class="plugin-update-tr"><td colspan="3" class="plugin-update"><div class="update-message">';
-       if ( ! current_user_can('update_plugins') )
-               printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s Details</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
-       else if ( empty($r->package) )
-               printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s Details</a> <em>automatic upgrade unavailable for this plugin</em>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
-       else
-               printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s Details</a> or <a href="%5$s">upgrade automatically</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url('update.php?action=upgrade-plugin&plugin=' . $file, 'upgrade-plugin_' . $file) );
+       $wp_list_table = _get_list_table('WP_Plugins_List_Table');

 
 

-       do_action( "in_plugin_update_message-$file", $plugin_data, $r );
+       if ( is_network_admin() || !is_multisite() ) {
+               echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';

 
 

-       echo '</div></td></tr>';
+               if ( ! current_user_can('update_plugins') )
+                       printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
+               else if ( empty($r->package) )
+                       printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
+               else
+                       printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update automatically</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) );
+
+               do_action( "in_plugin_update_message-$file", $plugin_data, $r );
+
+               echo '</div></td></tr>';
+       }

 }
 
 function wp_update_plugin($plugin, $feedback = '') {
 }
 
 function wp_update_plugin($plugin, $feedback = '') {

-

        if ( !empty($feedback) )
                add_filter('update_feedback', $feedback);
 
        if ( !empty($feedback) )
                add_filter('update_feedback', $feedback);
 


@@ -207,7 +218,7 @@ function wp_update_plugin($plugin, $feedback = '') {
 
 function get_theme_updates() {
        $themes = get_themes();
 
 function get_theme_updates() {
        $themes = get_themes();

-       $current = get_transient('update_themes');
+       $current = get_site_transient('update_themes');

        $update_themes = array();
 
        foreach ( $themes as $theme ) {
        $update_themes = array();
 
        foreach ( $themes as $theme ) {


@@ -222,7 +233,6 @@ function get_theme_updates() {
 }
 
 function wp_update_theme($theme, $feedback = '') {
 }
 
 function wp_update_theme($theme, $feedback = '') {

-

        if ( !empty($feedback) )
                add_filter('update_feedback', $feedback);
 
        if ( !empty($feedback) )
                add_filter('update_feedback', $feedback);
 


@@ -231,9 +241,47 @@ function wp_update_theme($theme, $feedback = '') {
        return $upgrader->upgrade($theme);
 }
 
        return $upgrader->upgrade($theme);
 }
 

+function wp_theme_update_rows() {
+       if ( !current_user_can('update_themes' ) )
+               return;

 
 

-function wp_update_core($current, $feedback = '') {
+       $themes = get_site_transient( 'update_themes' );
+       if ( isset($themes->response) && is_array($themes->response) ) {
+               $themes = array_keys( $themes->response );
+
+               foreach( $themes as $theme ) {
+                       add_action( "after_theme_row_$theme", 'wp_theme_update_row', 10, 2 );
+               }
+       }
+}
+add_action( 'admin_init', 'wp_theme_update_rows' );
+
+function wp_theme_update_row( $theme_key, $theme ) {
+       $current = get_site_transient( 'update_themes' );
+       if ( !isset( $current->response[ $theme_key ] ) )
+               return false;
+       $r = $current->response[ $theme_key ];
+       $themes_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array());
+       $theme_name = wp_kses( $theme['Name'], $themes_allowedtags );

 
 

+       $details_url = self_admin_url("theme-install.php?tab=theme-information&theme=$theme_key&TB_iframe=true&width=600&height=400");
+
+       $wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
+
+       echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
+       if ( ! current_user_can('update_themes') )
+               printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r->new_version );
+       else if ( empty( $r['package'] ) )
+               printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'] );
+       else
+               printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update automatically</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url( self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key) );
+
+       do_action( "in_theme_update_message-$theme_key", $theme, $r );
+
+       echo '</div></td></tr>';
+}
+
+function wp_update_core($current, $feedback = '') {

        if ( !empty($feedback) )
                add_filter('update_feedback', $feedback);
 
        if ( !empty($feedback) )
                add_filter('update_feedback', $feedback);
 


@@ -248,12 +296,12 @@ function maintenance_nag() {
        if ( ! isset( $upgrading ) )
                return false;
 
        if ( ! isset( $upgrading ) )
                return false;
 

-       if ( current_user_can('manage_options') )
+       if ( current_user_can('update_core') )

                $msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php' );
        else
                $msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.');
 
                $msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php' );
        else
                $msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.');
 

-       echo "<div id='update-nag'>$msg</div>";
+       echo "<div class='update-nag'>$msg</div>";

 }
 add_action( 'admin_notices', 'maintenance_nag' );
 
 }
 add_action( 'admin_notices', 'maintenance_nag' );