Changeset 8266

Timestamp:

07/07/2008 02:21:47 PM (18 years ago)

Author:

ryan

Message:

Notice fixes from jacobsantos. fixes #7255

Location:

trunk

Files:

• wp-admin/includes/plugin.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/includes/plugin.php

@@ -471 +471 @@
         $parent = get_admin_page_parent();
 
+        $page_type = 'admin';
         if ( empty ( $parent_page ) || 'admin.php' == $parent_page ) {
                 if ( isset( $admin_page_hooks[$plugin_page] ))
@@ -477 +478 @@
                         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 );

trunk/wp-includes/functions.php

@@ -2257 +2257 @@
  */
 function is_ssl() {
-        return ( 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false; 
+        return ( isset($_SERVER['HTTPS']) && 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false; 
 }