Ticket #3148: patch.diff

wp-includes/category.php

@@ -20 +20 @@
                 parse_str($args, $r);
 
         $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);
         if ( 'count' == $r['orderby'] )

wp-includes/post.php

@@ -99 +99 @@
                 }
         }
 
-        if ( defined(WP_IMPORTING) )
+        if ( defined('WP_IMPORTING') )
                 unset($post_cache);
 
         if ( $output == OBJECT ) {
@@ -923 +923 @@
                 wp_cache_add($page->ID, $page, 'pages');
                 $_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 {
                         $query = "SELECT * FROM $wpdb->posts WHERE ID= '$page' LIMIT 1";

wp-includes/classes.php

@@ -388 +388 @@
                         // If flat, start and end the element and skip the level checks.
                         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);
                                 }
         
                                 // 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);
                                 }
@@ -583 +583 @@
                                 $link .= ')';
                 }
         
-                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);
                 }
         

wp-includes/category-template.php

@@ -219 +219 @@
                 'child_of' => 0, 'feed' => '', 'feed_image' => '', 'exclude' => '',
                 '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);
 
         $categories = get_categories($r);