From 8887dcc0a29bd5579b9cd7150abc2119f26c8993 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Mon, 7 Jul 2008 14:21:47 +0000 Subject: [PATCH] Notice fixes from jacobsantos. fixes #7255 git-svn-id: https://develop.svn.wordpress.org/trunk@8266 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/plugin.php | 10 ++++------ wp-includes/functions.php | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 72acd45587..2822dac218 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -470,18 +470,16 @@ function get_plugin_page_hookname( $plugin_page, $parent_page ) { $parent = get_admin_page_parent(); + $page_type = 'admin'; if ( empty ( $parent_page ) || 'admin.php' == $parent_page ) { if ( isset( $admin_page_hooks[$plugin_page] )) $page_type = 'toplevel'; else if ( isset( $admin_page_hooks[$parent] )) $page_type = $admin_page_hooks[$parent]; - } else - if ( isset( $admin_page_hooks[$parent_page] ) ) { - $page_type = $admin_page_hooks[$parent_page]; - } else { - $page_type = 'admin'; - } + } else if ( isset( $admin_page_hooks[$parent_page] ) ) { + $page_type = $admin_page_hooks[$parent_page]; + } $plugin_name = preg_replace( '!\.php!', '', $plugin_page ); diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 3fe0f7c196..4df63b28ea 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2256,7 +2256,7 @@ function validate_file( $file, $allowed_files = '' ) { * @return bool True if SSL, false if not used. */ function is_ssl() { - return ( 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false; + return ( isset($_SERVER['HTTPS']) && 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false; } /**