Changeset 8266

Show
Ignore:
Timestamp:
07/07/08 14:21:47 (2 months ago)
Author:
ryan
Message:

Notice fixes from jacobsantos. fixes #7255

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/includes/plugin.php

    r8095 r8266  
    471471    $parent = get_admin_page_parent(); 
    472472 
     473    $page_type = 'admin'; 
    473474    if ( empty ( $parent_page ) || 'admin.php' == $parent_page ) { 
    474475        if ( isset( $admin_page_hooks[$plugin_page] )) 
    …… 
    477478            if ( isset( $admin_page_hooks[$parent] )) 
    478479                $page_type = $admin_page_hooks[$parent]; 
    479     } else 
    480         if ( isset( $admin_page_hooks[$parent_page] ) ) { 
    481             $page_type = $admin_page_hooks[$parent_page]; 
    482         } else { 
    483             $page_type = 'admin'; 
    484         } 
     480    } else if ( isset( $admin_page_hooks[$parent_page] ) ) { 
     481        $page_type = $admin_page_hooks[$parent_page]; 
     482    } 
    485483 
    486484    $plugin_name = preg_replace( '!\.php!', '', $plugin_page ); 

  • trunk/wp-includes/functions.php

    r8247 r8266  
    22572257 */ 
    22582258function is_ssl() { 
    2259     return ( 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false;  
     2259    return ( isset($_SERVER['HTTPS']) && 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false;  
    22602260} 
    22612261