Changeset 9793

Timestamp:

11/19/2008 07:25:53 PM (16 years ago)

Author:

ryan

Message:

Improve latest version detection in plugin updater. Props DD32. fixes #8129

Location:

trunk

Files:

• wp-admin/includes/plugin-install.php (modified) (2 diffs)
• wp-includes/update.php (modified) (1 diff)

trunk/wp-admin/includes/plugin-install.php

@@ -426 +426 @@
                 }
             }
-            if ( 'install' == $type && file_exists( WP_PLUGIN_DIR  . '/' . $api->slug ) ) //TODO: Make more.. searchable?
-                $type = 'latest_installed';
+            if ( 'install' == $type && is_dir( WP_PLUGIN_DIR  . '/' . $api->slug ) ) {
+                $installed_plugin = get_plugins('/' . $api->slug);
+                if ( ! empty($installed_plugin) ) {
+                    $key = array_shift( $key = array_keys($installed_plugin) ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
+                    if ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '>') ){
+                        $type = 'latest_installed';
+                    } elseif ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '<') ) {
+                        $type = 'newer_installed';
+                        $newer_version = $installed_plugin[ $key ]['Version'];
+                    } else {
+                        //If the above update check failed, Then that probably means that the update checker has out-of-date information, force a refresh
+                        delete_option('update_plugins');
+                        $update_file = $api->slug . '/' . $key; //This code branch only deals with a plugin which is in a folder the same name as its slug, Doesnt support plugins which have 'non-standard' names
+                        $type = 'update_available';
+                    }
+                }
+            }
 
             switch ( $type ) :
@@ -439 +454 @@
                     if ( current_user_can('update_plugins') ) :
                         ?><a href="<?php echo wp_nonce_url(admin_url('update.php?action=upgrade-plugin&plugin=' . $update_file), 'upgrade-plugin_' . $update_file) ?>" target="_parent"><?php _e('Install Update Now') ?></a><?php
+                    endif;
+                break;
+                case 'newer_installed':
+                    if ( current_user_can('install_plugins') || current_user_can('update_plugins') ) :
+                    ?><a><?php printf(__('Newer Version (%s) Installed'), $newer_version) ?></a><?php
                     endif;
                 break;

trunk/wp-includes/update.php

@@ -273 +273 @@
 
 add_action( 'load-plugins.php', 'wp_update_plugins' );
+add_action( 'load-update.php', 'wp_update_plugins' );
 add_action( 'admin_init', '_maybe_update_plugins' );
 add_action( 'wp_update_plugins', 'wp_update_plugins' );