Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-30 00:34:57 +02:00
Code Issues Projects Releases Wiki Activity

Plugin install: De-duplicate a conditional, introduced in [38172].

Browse Source 
props ChrisWiegman.
fixes #38190.

Built from https://develop.svn.wordpress.org/trunk@39336


git-svn-id: http://core.svn.wordpress.org/trunk@39276 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2016-11-21 21:33:30 +00:00
parent 014bb86248
commit 2406fe498c
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/plugin-install.php
View File

@ -129,7 +129,7 @@ include(ABSPATH . 'wp-admin/admin-header.php');
* Output the upload plugin form on every non-upload plugin install screen, so it can be * Output the upload plugin form on every non-upload plugin install screen, so it can be
* displayed via JavaScript rather then opening up the devoted upload plugin page. * displayed via JavaScript rather then opening up the devoted upload plugin page.
*/ */
if ( $tab !== 'upload' ) { if ( 'upload' !== $tab ) {
?> ?>
<div class="upload-plugin-wrap"> <div class="upload-plugin-wrap">
<?php <?php
@ -138,9 +138,6 @@ if ( $tab !== 'upload' ) {
?> ?>
</div> </div>
<?php <?php
}
if ( $tab !== 'upload' ) {
$wp_list_table->views(); $wp_list_table->views();
echo '<br class="clear" />'; echo '<br class="clear" />';
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-beta4-39335'; $wp_version = '4.7-beta4-39336';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.