Changeset 11586

Timestamp:

06/16/2009 07:37:11 PM (15 years ago)

Author:

ryan

Message:

Plugin install fixes. Props Denis-de-Bernardy. see #10192 for 2.8.1

Location:

branches/2.8

Files:

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

branches/2.8/wp-admin/includes/plugin-install.php

@@ -47 +47 @@
                 $res = new WP_Error('plugins_api_failed', __('An unknown error occurred'), $request['body']);
         }
+    } elseif ( !is_wp_error($res) ) {
+        $res->external = true;
     }
 
@@ -442 +444 @@
             $type = 'install';
             //Check to see if this plugin is known to be installed, and has an update awaiting it.
-            $update_plugins = get_option('update_plugins');
+            $update_plugins = get_transient('update_plugins');
             if ( is_object( $update_plugins ) ) {
                 foreach ( (array)$update_plugins->response as $file => $plugin ) {
@@ -463 +465 @@
                     } 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');
+                        delete_transient('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';
@@ -510 +512 @@
 <?php endif; if ( ! empty($api->downloaded) ) : ?>
             <li><strong><?php _e('Downloaded:') ?></strong> <?php printf(_n('%s time', '%s times', $api->downloaded), number_format_i18n($api->downloaded)) ?></li>
-<?php endif; if ( ! empty($api->slug) ) : ?>
+<?php endif; if ( ! empty($api->slug) && empty($api->external) ) : ?>
             <li><a target="_blank" href="http://wordpress.org/extend/plugins/<?php echo $api->slug ?>/"><?php _e('WordPress.org Plugin Page &#187;') ?></a></li>
 <?php endif; if ( ! empty($api->homepage) ) : ?>
@@ -516 +518 @@
 <?php endif; ?>
         </ul>
+        <?php if ( ! empty($api->rating) ) : ?>
         <h2><?php _e('Average Rating') ?></h2>
         <div class="star-holder" title="<?php printf(_n('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?>">
@@ -526 +529 @@
         </div>
         <small><?php printf(_n('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?></small>
+        <?php endif; ?>
     </div>
     <div id="section-holder" class="wrap">

branches/2.8/wp-includes/update.php

@@ -116 +116 @@
     $new_option = new stdClass;
     $new_option->last_checked = time();
-    $timeout = 'load-plugins.php' == current_filter() ? 360 : 43200; //Check for updated every 60 minutes if hitting the themes page, Else, check every 12 hours
+    $timeout = 'load-plugins.php' == current_filter() ? 3600 : 43200; //Check for updated every 60 minutes if hitting the themes page, Else, check every 12 hours
     $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
 
@@ -199 +199 @@
     $new_option = new stdClass;
     $new_option->last_checked = time( );
-    $timeout = 'load-themes.php' == current_filter() ? 360 : 43200; //Check for updated every 60 minutes if hitting the themes page, Else, check every 12 hours
+    $timeout = 'load-themes.php' == current_filter() ? 3600 : 43200; //Check for updated every 60 minutes if hitting the themes page, Else, check every 12 hours
     $time_not_changed = isset( $current_theme->last_checked ) && $timeout > ( time( ) - $current_theme->last_checked );