Changeset 6436

Show
Ignore:
Timestamp:
12/20/07 21:25:12 (7 months ago)
Author:
westi
Message:

Fix some of the notices visible with WP_DEBUG enabled.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/wp-includes/bookmark-template.php

    r6161 r6436  
    55        'show_updated' => 0, 'show_description' => 0, 
    66        'show_images' => 1, 'before' => '<li>', 
    7         'after' => '</li>', 'between' => "\n" 
     7        'after' => '</li>', 'between' => "\n", 
     8        'show_rating' => 0 
    89    ); 
    910 
     
    1112    extract( $r, EXTR_SKIP ); 
    1213 
     14    $output = ''; // Blank string to start with. 
     15     
    1316    foreach ( (array) $bookmarks as $bookmark ) { 
    1417        if ( !isset($bookmark->recently_updated) ) 
  • trunk/wp-includes/canonical.php

    r6364 r6436  
    2121    // Some PHP setups turn requests for / into /index.php in REQUEST_URI 
    2222    $original['path'] = preg_replace('|/index\.php$|', '/', $original['path']); 
    23  
     23     
    2424    $redirect = $original; 
    2525    $redirect_url = false; 
  • trunk/wp-includes/classes.php

    r6388 r6436  
    528528        if ( $depth ) 
    529529            $indent = str_repeat("\t", $depth); 
     530        else 
     531            $indent = ''; 
     532             
    530533        extract($args, EXTR_SKIP); 
    531534        $css_class = 'page_item page-item-'.$page->ID; 
     
    647650        } 
    648651 
    649         if ( $current_category ) 
     652        if ( isset($current_category) && $current_category ) 
    650653            $_current_category = get_category( $current_category ); 
    651654 
     
    653656            $output .= "\t<li"; 
    654657            $class = 'cat-item cat-item-'.$category->term_id; 
    655             if ( $current_category && ($category->term_id == $current_category) ) 
     658            if ( isset($current_category) && $current_category && ($category->term_id == $current_category) ) 
    656659                $class .=  ' current-cat'; 
    657             elseif ( $_current_category && ($category->term_id == $_current_category->parent) ) 
     660            elseif ( isset($_current_category) && $_current_category && ($category->term_id == $_current_category->parent) ) 
    658661                $class .=  ' current-cat-parent'; 
    659662            $output .=  ' class="'.$class.'"'; 
  • trunk/wp-includes/widgets.php

    r6381 r6436  
    204204    $sidebars_widgets = wp_get_sidebars_widgets(); 
    205205 
    206     if ( empty($wp_registered_sidebars[$index]) || !is_array($sidebars_widgets[$index]) || empty($sidebars_widgets[$index]) ) 
     206    if ( empty($wp_registered_sidebars[$index]) || !array_key_exists($index, $sidebars_widgets) || !is_array($sidebars_widgets[$index]) || empty($sidebars_widgets[$index]) ) 
    207207        return false; 
    208208