Changeset 4198

Timestamp:

09/19/2006 11:56:28 PM (19 years ago)

Author:

ryan

Message:

Warning and notice fixes from Alex King. fixes #3148

Location:

trunk/wp-includes

Files:

• category-template.php (modified) (1 diff)
• category.php (modified) (1 diff)
• classes.php (modified) (3 diffs)
• post.php (modified) (2 diffs)

trunk/wp-includes/category-template.php

@@ -220 +220 @@
         'hierarchical' => true, 'title_li' => __('Categories'));
     $r = array_merge($defaults, $r);
-    $r['include_last_update_time'] = $r['show_date'];
+    if ( isset($r['show_date']) )
+        $r['include_last_update_time'] = $r['show_date'];
     extract($r);
 

trunk/wp-includes/category.php

@@ -21 +21 @@
 
     $defaults = array('type' => 'post', 'child_of' => 0, 'orderby' => 'name', 'order' => 'ASC',
-        'hide_empty' => true, 'include_last_update_time' => false, 'hierarchical' => 1, $exclude => '', $include => '',
+        'hide_empty' => true, 'include_last_update_time' => false, 'hierarchical' => 1, 'exclude' => '', 'include' => '',
         'number' => '');
     $r = array_merge($defaults, $r);

trunk/wp-includes/classes.php

@@ -389 +389 @@
             if ( $flat) {
                 // Start the element.
-                if ( $element->$id_field != 0 ) {
+                if ( isset($element->$id_field) && $element->$id_field != 0 ) {
                     $cb_args = array_merge( array($output, $element, $depth - 1), $args);
                     $output = call_user_func_array(array(&$this, 'start_el'), $cb_args);
@@ -395 +395 @@
     
                 // End the element.
-                if ( $element->$id_field != 0 ) {
+                if ( isset($element->$id_field) && $element->$id_field != 0 ) {
                     $cb_args = array_merge( array($output, $element, $depth - 1), $args);
                     $output = call_user_func_array(array(&$this, 'end_el'), $cb_args);
@@ -584 +584 @@
         }
     
-        if ( $show_count )
+        if ( isset($show_count) && $show_count )
             $link .= ' ('.intval($category->category_count).')';
     
-        if ( $show_date ) {
+        if ( isset($show_date) && $show_date ) {
             $link .= ' ' . gmdate('Y-m-d', $category->last_update_timestamp);
         }

trunk/wp-includes/post.php

@@ -100 +100 @@
     }
 
-    if ( defined(WP_IMPORTING) )
+    if ( defined('WP_IMPORTING') )
         unset($post_cache);
 
@@ -924 +924 @@
         $_page = $page;
     } else {
-        if ( isset($GLOBALS['page']) && ($page == $GLOBALS['page']->ID) ) {
+        if ( isset($GLOBALS['page']->ID) && ($page == $GLOBALS['page']->ID) ) {
             $_page = & $GLOBALS['page'];
             wp_cache_add($_page->ID, $_page, 'pages');
-        } elseif ( $_page = $GLOBALS['post_cache'][$page] ) {
+        } elseif ( isset($_page) && $_page == $GLOBALS['post_cache'][$page] ) {
             return get_post($page, $output);
-        } elseif ( $_page = wp_cache_get($page, 'pages') ) {
+        } elseif ( isset($_page) && $_page == wp_cache_get($page, 'pages') ) {
             // Got it.
         } else {