From 883ee72ed63343f65fe3c81819fe2aa235816c25 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Tue, 15 Jan 2019 05:48:50 +0000
Subject: [PATCH] Coding Standards: Move an assignment out of a condition in
 `wp-admin/admin.php`.

Props subrataemfluence, jrf, pento.
Fixes #44363.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44429 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin.php      | 4 +++-
 wp-includes/version.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index 44db62de8d..bac33a188a 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -174,7 +174,9 @@ if ( isset( $plugin_page ) ) {
 	} else {
 		$the_parent = $pagenow;
 	}
-	if ( ! $page_hook = get_plugin_page_hook( $plugin_page, $the_parent ) ) {
+
+	$page_hook = get_plugin_page_hook( $plugin_page, $the_parent );
+	if ( ! $page_hook ) {
 		$page_hook = get_plugin_page_hook( $plugin_page, $plugin_page );
 
 		// Back-compat for plugins using add_management_page().
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d21202f093..9662d1d768 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.1-beta1-44597';
+$wp_version = '5.1-beta1-44598';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.