Ticket #11050: plugin-install.patch

Users/scottbasgaard/Sites/trunk/wp-admin/includes/plugin-install.php

@@ -309 +309 @@
                                 <th scope="col" class="num"><?php _e('Version'); ?></th>
                                 <th scope="col" class="num"><?php _e('Rating'); ?></th>
                                 <th scope="col" class="desc"><?php _e('Description'); ?></th>
-                                <th scope="col" class="action-links"><?php _e('Actions'); ?></th>
                         </tr>
                 </thead>
 
@@ -319 +318 @@
                                 <th scope="col" class="num"><?php _e('Version'); ?></th>
                                 <th scope="col" class="num"><?php _e('Rating'); ?></th>
                                 <th scope="col" class="desc"><?php _e('Description'); ?></th>
-                                <th scope="col" class="action-links"><?php _e('Actions'); ?></th>
                         </tr>
                 </tfoot>
 
@@ -333 +331 @@
                                         $plugin = (array) $plugin;
 
                                 $title = wp_kses($plugin['name'], $plugins_allowedtags);
+                                $version = wp_kses($plugin['version'], $plugins_allowedtags);
+                                $name = strip_tags($title . ' ' . $version);
+                                $title = '<a href="' . admin_url('plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .
+                                                                        '&amp;TB_iframe=true&amp;width=600&amp;height=550') . '" class="thickbox onclick" title="' .
+                                                                        esc_attr($name) . '">' . $name . '</a>';
+                                
                                 //Limit description to 400char, and remove any HTML.
                                 $description = strip_tags($plugin['description']);
                                 if ( strlen($description) > 400 )
@@ -344 +348 @@
                                 $description = preg_replace("|(\r?\n)+|", "\n", $description);
                                 //\n => <br>
                                 $description = nl2br($description);
-                                $version = wp_kses($plugin['version'], $plugins_allowedtags);
 
-                                $name = strip_tags($title . ' ' . $version);
-
                                 $author = $plugin['author'];
                                 if ( ! empty($plugin['author']) )
                                         $author = ' <cite>' . sprintf( __('By %s'), $author ) . '.</cite>';
 
                                 $author = wp_kses($author, $plugins_allowedtags);
-
-                                if ( isset($plugin['homepage']) )
-                                        $title = '<a target="_blank" href="' . esc_attr($plugin['homepage']) . '">' . $title . '</a>';
-
-                                $action_links = array();
-                                $action_links[] = '<a href="' . admin_url('plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .
-                                                                        '&amp;TB_iframe=true&amp;width=600&amp;height=550') . '" class="thickbox onclick" title="' .
-                                                                        esc_attr($name) . '">' . __('Install') . '</a>';
-
-                                $action_links = apply_filters('plugin_install_action_links', $action_links, $plugin);
                         ?>
                         <tr>
                                 <td class="name"><?php echo $title; ?></td>
@@ -378 +369 @@
                                         </div>
                                 </td>
                                 <td class="desc"><?php echo $description, $author; ?></td>
-                                <td class="action-links"><?php if ( !empty($action_links) )     echo implode(' | ', $action_links); ?></td>
                         </tr>
                         <?php
                         }