Ticket #11227: #11227.patch

wp-admin/includes/plugin.php

@@ -43 +43 @@
  *              'PluginURI' - Plugin web site address.
  *              'TextDomain' - Plugin's text domain for localization.
  *              'DomainPath' - Plugin's relative directory path to .mo files.
+ *              'UpgradeCheck' - (optional) Plugin's auto-upgrade check discarded
+ *              'UpgradeText' - (optional) Plugin's auto-upgrade message when upgradable.
  *
  * Some users have issues with opening large files and manipulating the contents
  * for want is usually the first 1kiB or 2kiB. This function stops pulling in
@@ -75 +77 @@
                 'Author' => 'Author', 
                 'AuthorURI' => 'Author URI', 
                 'TextDomain' => 'Text Domain', 
-                'DomainPath' => 'Domain Path' 
+                'DomainPath' => 'Domain Path',
+                'UpgradeCheck' => 'Upgrade Check', 
+                'UpgradeText' => 'Upgrade Text'
                 );
 
         $plugin_data = get_file_data( $plugin_file, $default_headers, 'plugin' );

wp-admin/includes/update.php

@@ -185 +185 @@
         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 (isset($plugin_data['UpgradeText']) && !empty($plugin_data['UpgradeText']))
+                printf( __('There is a new version of %1$s available. %2$s'), $plugin_name, $plugin_data['UpgradeText'] );
         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

wp-includes/update.php

@@ -120 +120 @@
 
         $plugin_changed = false;
         foreach ( $plugins as $file => $p ) {
+
+                if (isset($p['UpgradeCheck']) && !empty($p['UpgradeCheck']))
+                {
+                        unset($plugins[$file]);
+                        continue;
+                }
+
                 $new_option->checked[ $file ] = $p['Version'];
 
                 if ( !isset( $current->checked[ $file ] ) || strval($current->checked[ $file ]) !== strval($p['Version']) )
@@ -139 +146 @@
         if ( $time_not_changed && !$plugin_changed )
                 return false;
 
+        if (empty($plugins)) return false;
+
+        // active plugins synchronized with plugins ($active clean-up)
+        $active_flip = array_flip($active);
+        $active = array();
+        foreach($plugins as $file => $p) if (isset($active_flip[$file])) $active[] = $file;
+
         // Update last_checked for current to prevent multiple blocking requests if request hangs
         $current->last_checked = time();
         set_transient( 'update_plugins', $current );