Changeset 6436

Timestamp:

12/20/2007 09:25:12 PM (17 years ago)

Author:

westi

Message:

Fix some of the notices visible with WP_DEBUG enabled.

Location:

trunk/wp-includes

Files:

• bookmark-template.php (modified) (2 diffs)
• canonical.php (modified) (1 diff)
• classes.php (modified) (3 diffs)
• widgets.php (modified) (1 diff)

trunk/wp-includes/bookmark-template.php

@@ -5 +5 @@
         'show_updated' => 0, 'show_description' => 0,
         'show_images' => 1, 'before' => '<li>',
-        'after' => '</li>', 'between' => "\n"
+        'after' => '</li>', 'between' => "\n",
+        'show_rating' => 0
     );
 
@@ -11 +12 @@
     extract( $r, EXTR_SKIP );
 
+    $output = ''; // Blank string to start with.
+    
     foreach ( (array) $bookmarks as $bookmark ) {
         if ( !isset($bookmark->recently_updated) )

trunk/wp-includes/canonical.php

@@ -21 +21 @@
     // Some PHP setups turn requests for / into /index.php in REQUEST_URI
     $original['path'] = preg_replace('|/index\.php$|', '/', $original['path']);
-
+    
     $redirect = $original;
     $redirect_url = false;

trunk/wp-includes/classes.php

@@ -528 +528 @@
         if ( $depth )
             $indent = str_repeat("\t", $depth);
+        else
+            $indent = '';
+            
         extract($args, EXTR_SKIP);
         $css_class = 'page_item page-item-'.$page->ID;
@@ -647 +650 @@
         }
 
-        if ( $current_category )
+        if ( isset($current_category) && $current_category )
             $_current_category = get_category( $current_category );
 
@@ -653 +656 @@
             $output .= "\t<li";
             $class = 'cat-item cat-item-'.$category->term_id;
-            if ( $current_category && ($category->term_id == $current_category) )
+            if ( isset($current_category) && $current_category && ($category->term_id == $current_category) )
                 $class .=  ' current-cat';
-            elseif ( $_current_category && ($category->term_id == $_current_category->parent) )
+            elseif ( isset($_current_category) && $_current_category && ($category->term_id == $_current_category->parent) )
                 $class .=  ' current-cat-parent';
             $output .=  ' class="'.$class.'"';

trunk/wp-includes/widgets.php

@@ -204 +204 @@
     $sidebars_widgets = wp_get_sidebars_widgets();
 
-    if ( empty($wp_registered_sidebars[$index]) || !is_array($sidebars_widgets[$index]) || empty($sidebars_widgets[$index]) )
+    if ( empty($wp_registered_sidebars[$index]) || !array_key_exists($index, $sidebars_widgets) || !is_array($sidebars_widgets[$index]) || empty($sidebars_widgets[$index]) )
         return false;