WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add some braces to [29225]. 

see #28673.
Built from https://develop.svn.wordpress.org/trunk@29350


git-svn-id: http://core.svn.wordpress.org/trunk@29127 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2014-08-01 21:04:15 +00:00
parent 7753c3ff05
commit 9a9b1791ca
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
wp-admin/includes/class-wp-plugin-install-list-table.php
View File

@ -181,8 +181,9 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
'per_page' => $args['per_page'], 'per_page' => $args['per_page'],
) ); ) );
if ( isset( $api->info['groups'] ) ) if ( isset( $api->info['groups'] ) ) {
$this->groups = $api->info['groups']; $this->groups = $api->info['groups'];
}
} }
public function no_items() { public function no_items() {
@ -293,24 +294,25 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
} }
public function _order_callback( $plugin_a, $plugin_b ) { public function _order_callback( $plugin_a, $plugin_b ) {
$orderby = $this->orderby; $orderby = $this->orderby;
if ( !isset( $plugin_a->$orderby, $plugin_b->$orderby ) ) if ( ! isset( $plugin_a->$orderby, $plugin_b->$orderby ) ) {
return 0; return 0;
}
$a = $plugin_a->$orderby; $a = $plugin_a->$orderby;
$b = $plugin_b->$orderby; $b = $plugin_b->$orderby;
if ( $a == $b ) if ( $a == $b ) {
return 0; return 0;
}
if ( 'DESC' == $this->order ) if ( 'DESC' == $this->order ) {
return ( $a < $b ) ? 1 : -1; return ( $a < $b ) ? 1 : -1;
else } else {
return ( $a < $b ) ? -1 : 1; return ( $a < $b ) ? -1 : 1;
}
} }
public function display_rows() { public function display_rows() {
$plugins_allowedtags = array( $plugins_allowedtags = array(
'a' => array( 'href' => array(),'title' => array(), 'target' => array() ), 'a' => array( 'href' => array(),'title' => array(), 'target' => array() ),
@ -329,15 +331,17 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
$group = null; $group = null;
foreach ( (array) $this->items as $plugin ) { foreach ( (array) $this->items as $plugin ) {
if ( is_object( $plugin ) ) if ( is_object( $plugin ) ) {
$plugin = (array) $plugin; $plugin = (array) $plugin;
}
// Display the group heading if there is one // Display the group heading if there is one
if ( isset( $plugin['group'] ) && $plugin['group'] != $group ) { if ( isset( $plugin['group'] ) && $plugin['group'] != $group ) {
if ( isset( $this->groups[ $plugin['group'] ] ) ) if ( isset( $this->groups[ $plugin['group'] ] ) ) {
$group_name = translate( $this->groups[ $plugin['group'] ] ); // Does this need context? $group_name = translate( $this->groups[ $plugin['group'] ] ); // Does this need context?
else } else {
$group_name = $plugin['group']; $group_name = $plugin['group'];
}
// Starting a new group, close off the divs of the last one // Starting a new group, close off the divs of the last one
if ( ! empty( $group ) ) { if ( ! empty( $group ) ) {
@ -358,14 +362,11 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
$name = strip_tags( $title . ' ' . $version ); $name = strip_tags( $title . ' ' . $version );
$author = $plugin['author']; $author = wp_kses( $plugin['author'], $plugins_allowedtags );
if ( ! empty( $author ) ) { if ( ! empty( $author ) ) {
$author = ' <cite>' . sprintf( __( 'By %s' ), $author ) . '</cite>'; $author = ' <cite>' . sprintf( __( 'By %s' ), $author ) . '</cite>';
} }
$author = wp_kses( $author, $plugins_allowedtags );
$action_links = array(); $action_links = array();
if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) { if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) {