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

Plugins: After [41608], make the markup in `WP_Plugin_Install_List_Table::no_items()` a bit more readable. 

See #37430.
Built from https://develop.svn.wordpress.org/trunk@41915


git-svn-id: http://core.svn.wordpress.org/trunk@41749 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2017-10-18 17:58:48 +00:00
parent 4dd637acde
commit 936bf3661f
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,7 +255,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
if ( $upgrade_plugins ) {
$js_plugins['upgrade'] = array_values( $upgrade_plugins );
}
}
wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
'plugins' => $js_plugins,
@ -267,10 +267,13 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
/**
*/
public function no_items() {
if ( isset( $this->error ) ) {
echo '<div class="inline error"><p>' . $this->error->get_error_message() . '</p><p class="hide-if-no-js"><button class="button try-again">' . __( 'Try Again' ) . '</button></p></div>';
} else {
echo '<div class="no-plugin-results">' . __( 'No plugins found. Try a different search.' ) . '</div>';
if ( isset( $this->error ) ) { ?>
<div class="inline error"><p><?php echo $this->error->get_error_message(); ?></p>
<p class="hide-if-no-js"><button class="button try-again"><?php _e( 'Try Again' ); ?></button></p>
</div>
<?php } else { ?>
<div class="no-plugin-results"><?php _e( 'No plugins found. Try a different search.' ); ?></div>
<?php
}
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.9-beta2-41914';
$wp_version = '4.9-beta2-41915';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.