Wordpress 3.6

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

diff --git a/wp-includes/update.php b/wp-includes/update.php
index 34573478ebc7b6c277df243bfc450eb0c8039b3d..61d163aaf40ac68b06644e3bc0813167b1fa7726 100644 (file)
--- a/wp-includes/update.php
+++ b/wp-includes/update.php
@@ -51,13 +51,13 @@ function wp_version_check() {
        else
                $mysql_version = 'N/A';
 
        else
                $mysql_version = 'N/A';
 

-       if ( is_multisite( ) ) {
-               $user_count = get_user_count( );
-               $num_blogs = get_blog_count( );
-               $wp_install = network_site_url( );
+       if ( is_multisite() ) {
+               $user_count = get_user_count();
+               $num_blogs = get_blog_count();
+               $wp_install = network_site_url();

                $multisite_enabled = 1;
        } else {
                $multisite_enabled = 1;
        } else {

-               $user_count = count_users( );
+               $user_count = count_users();

                $user_count = $user_count['total_users'];
                $multisite_enabled = 0;
                $num_blogs = 1;
                $user_count = $user_count['total_users'];
                $multisite_enabled = 0;
                $num_blogs = 1;


@@ -155,14 +155,14 @@ function wp_update_plugins() {
        // Check for update on a different schedule, depending on the page.
        switch ( current_filter() ) {
                case 'load-update-core.php' :
        // Check for update on a different schedule, depending on the page.
        switch ( current_filter() ) {
                case 'load-update-core.php' :

-                       $timeout = 60; // 1 min
+                       $timeout = MINUTE_IN_SECONDS;

                        break;
                case 'load-plugins.php' :
                case 'load-update.php' :
                        break;
                case 'load-plugins.php' :
                case 'load-update.php' :

-                       $timeout = 3600; // 1 hour
+                       $timeout = HOUR_IN_SECONDS;

                        break;
                default :
                        break;
                default :

-                       $timeout = 43200; // 12 hours
+                       $timeout = 12 * HOUR_IN_SECONDS;

        }
 
        $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
        }
 
        $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );


@@ -264,23 +264,21 @@ function wp_update_themes() {
        // Check for update on a different schedule, depending on the page.
        switch ( current_filter() ) {
                case 'load-update-core.php' :
        // Check for update on a different schedule, depending on the page.
        switch ( current_filter() ) {
                case 'load-update-core.php' :

-                       $timeout = 60; // 1 min
+                       $timeout = MINUTE_IN_SECONDS;

                        break;
                case 'load-themes.php' :
                case 'load-update.php' :
                        break;
                case 'load-themes.php' :
                case 'load-update.php' :

-                       $timeout = 3600; // 1 hour
+                       $timeout = HOUR_IN_SECONDS;

                        break;
                default :
                        break;
                default :

-                       $timeout = 43200; // 12 hours
+                       $timeout = 12 * HOUR_IN_SECONDS;

        }
 
        }
 

-       $time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time( ) - $last_update->last_checked );
+       $time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time() - $last_update->last_checked );

 
        if ( $time_not_changed ) {
                $theme_changed = false;
                foreach ( $checked as $slug => $v ) {
 
        if ( $time_not_changed ) {
                $theme_changed = false;
                foreach ( $checked as $slug => $v ) {

-                       $update_request->checked[ $slug ] = $v;
-

                        if ( !isset( $last_update->checked[ $slug ] ) || strval($last_update->checked[ $slug ]) !== strval($v) )
                                $theme_changed = true;
                }
                        if ( !isset( $last_update->checked[ $slug ] ) || strval($last_update->checked[ $slug ]) !== strval($v) )
                                $theme_changed = true;
                }


@@ -315,7 +313,7 @@ function wp_update_themes() {
                return false;
 
        $new_update = new stdClass;
                return false;
 
        $new_update = new stdClass;

-       $new_update->last_checked = time( );
+       $new_update->last_checked = time();

        $new_update->checked = $checked;
 
        $response = maybe_unserialize( wp_remote_retrieve_body( $raw_response ) );
        $new_update->checked = $checked;
 
        $response = maybe_unserialize( wp_remote_retrieve_body( $raw_response ) );


@@ -354,17 +352,17 @@ function wp_get_update_data() {
        }
 
        $counts['total'] = $counts['plugins'] + $counts['themes'] + $counts['wordpress'];
        }
 
        $counts['total'] = $counts['plugins'] + $counts['themes'] + $counts['wordpress'];

-       $update_title = array();
+       $titles = array();

        if ( $counts['wordpress'] )
        if ( $counts['wordpress'] )

-               $update_title[] = sprintf(__('%d WordPress Update'), $counts['wordpress']);
+               $titles['wordpress'] = sprintf( __( '%d WordPress Update'), $counts['wordpress'] );

        if ( $counts['plugins'] )
        if ( $counts['plugins'] )

-               $update_title[] = sprintf(_n('%d Plugin Update', '%d Plugin Updates', $counts['plugins']), $counts['plugins']);
+               $titles['plugins'] = sprintf( _n( '%d Plugin Update', '%d Plugin Updates', $counts['plugins'] ), $counts['plugins'] );

        if ( $counts['themes'] )
        if ( $counts['themes'] )

-               $update_title[] = sprintf(_n('%d Theme Update', '%d Theme Updates', $counts['themes']), $counts['themes']);
+               $titles['themes'] = sprintf( _n( '%d Theme Update', '%d Theme Updates', $counts['themes'] ), $counts['themes'] );

 
 

-       $update_title = ! empty( $update_title ) ? esc_attr( implode( ', ', $update_title ) ) : '';
+       $update_title = $titles ? esc_attr( implode( ', ', $titles ) ) : '';

 
 

-       return array( 'counts' => $counts, 'title' => $update_title );
+       return apply_filters( 'wp_get_update_data', array( 'counts' => $counts, 'title' => $update_title ), $titles );

 }
 
 function _maybe_update_core() {
 }
 
 function _maybe_update_core() {


@@ -373,7 +371,7 @@ function _maybe_update_core() {
        $current = get_site_transient( 'update_core' );
 
        if ( isset( $current->last_checked ) &&
        $current = get_site_transient( 'update_core' );
 
        if ( isset( $current->last_checked ) &&

-               43200 > ( time() - $current->last_checked ) &&
+               12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) &&

                isset( $current->version_checked ) &&
                $current->version_checked == $wp_version )
                return;
                isset( $current->version_checked ) &&
                $current->version_checked == $wp_version )
                return;


@@ -392,7 +390,7 @@ function _maybe_update_core() {
  */
 function _maybe_update_plugins() {
        $current = get_site_transient( 'update_plugins' );
  */
 function _maybe_update_plugins() {
        $current = get_site_transient( 'update_plugins' );

-       if ( isset( $current->last_checked ) && 43200 > ( time() - $current->last_checked ) )
+       if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) )

                return;
        wp_update_plugins();
 }
                return;
        wp_update_plugins();
 }


@@ -406,9 +404,9 @@ function _maybe_update_plugins() {
  * @since 2.7.0
  * @access private
  */
  * @since 2.7.0
  * @access private
  */

-function _maybe_update_themes( ) {
+function _maybe_update_themes() {

        $current = get_site_transient( 'update_themes' );
        $current = get_site_transient( 'update_themes' );

-       if ( isset( $current->last_checked ) && 43200 > ( time( ) - $current->last_checked ) )
+       if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) )

                return;
 
        wp_update_themes();
                return;
 
        wp_update_themes();