Changeset 11714

Timestamp:

07/14/2009 08:34:39 AM (15 years ago)

Author:

azaozz

Message:

Hide update notification for themes that are updated manually, props Denis-de-Bernardy, fixes #10220

File:

• trunk/wp-includes/update.php (modified) (3 diffs)

trunk/wp-includes/update.php

@@ -202 +202 @@
     $time_not_changed = isset( $current_theme->last_checked ) && $timeout > ( time( ) - $current_theme->last_checked );
 
-    if( $time_not_changed )
+    $themes = array();
+    $checked = array();
+    $themes['current_theme'] = (array) $current_theme;
+    foreach( (array) $installed_themes as $theme_title => $theme ) {
+        $themes[$theme['Stylesheet']] = array();
+        $checked[$theme['Stylesheet']] = $theme['Version'];
+
+        foreach( (array) $theme as $key => $value ) {
+            $themes[$theme['Stylesheet']][$key] = $value;
+        }
+    }
+
+    $theme_changed = false;
+    foreach ( $checked as $slug => $v ) {
+        $new_option->checked[ $slug ] = $v;
+
+        if ( !isset( $current_theme->checked[ $slug ] ) || strval($current_theme->checked[ $slug ]) !== strval($v) )
+            $theme_changed = true;
+    }
+
+    if ( isset ( $current_theme->response ) && is_array( $current_theme->response ) ) {
+        foreach ( $current_theme->response as $slug => $update_details ) {
+            if ( ! isset($checked[ $slug ]) ) {
+                $theme_changed = true;
+                break;
+            }
+        }
+    }
+
+    if( $time_not_changed && !$theme_changed )
         return false;
 
@@ -210 +239 @@
 
     $current_theme->template = get_option( 'template' );
-
-    $themes = array( );
-    $themes['current_theme'] = (array) $current_theme;
-    foreach( (array) $installed_themes as $theme_title => $theme ) {
-        $themes[$theme['Stylesheet']] = array( );
-
-        foreach( (array) $theme as $key => $value ) {
-            $themes[$theme['Stylesheet']][$key] = $value;
-        }
-    }
 
     $options = array(
@@ -236 +255 @@
 
     $response = unserialize( $raw_response['body'] );
-    if( $response )
+    if( $response ) {
+        $new_option->checked = $checked;
         $new_option->response = $response;
+    }
 
     set_transient( 'update_themes', $new_option );