Ticket #12562: page_comments.diff

wp-includes/default-widgets.php

@@ -103 +103 @@
                 $show_rating = isset($instance['rating']) ? $instance['rating'] : false;
                 $show_images = isset($instance['images']) ? $instance['images'] : true;
                 $category = isset($instance['category']) ? $instance['category'] : false;
-
+                $title = apply_filters('widget_title', empty( $instance['title'] ) ? __( 'All Links' ) : $instance['title']);
+                
                 if ( is_admin() && !$category ) {
                         // Display All Links widget as such in the widgets screen
-                        echo $before_widget . $before_title. __('All Links') . $after_title . $after_widget;
+                        echo $before_widget . $before_title. $title . $after_title . $after_widget;
                         return;
                 }
 
-                $before_widget = preg_replace('/id="[^"]*"/','id="%id"', $before_widget);
+                
+                echo $before_widget . $before_title. $title . $after_title;
+                
                 wp_list_bookmarks(apply_filters('widget_links_args', array(
                         'title_before' => $before_title, 'title_after' => $after_title,
-                        'category_before' => $before_widget, 'category_after' => $after_widget,
+                        'category_before' => '', 'category_after' => '',
                         'show_images' => $show_images, 'show_description' => $show_description,
                         'show_name' => $show_name, 'show_rating' => $show_rating,
                         'category' => $category, 'class' => 'linkcat widget'
                 )));
+
+                echo $after_widget;
         }
 
         function update( $new_instance, $old_instance ) {
@@ -127 +132 @@
                         if ( isset($new_instance[$field]) )
                                 $instance[$field] = 1;
                 }
+                $instance['title'] = strip_tags($new_instance['title']);
                 $instance['category'] = intval($new_instance['category']);
 
                 return $instance;
         }
 
         function form( $instance ) {
-
+                $title = esc_attr( $instance['title'] );
                 //Defaults
                 $instance = wp_parse_args( (array) $instance, array( 'images' => true, 'name' => true, 'description' => false, 'rating' => false, 'category' => false ) );
                 $link_cats = get_terms( 'link_category');
 ?>
+                <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $title; ?>" /></p>
+        
                 <p>
                 <label for="<?php echo $this->get_field_id('category'); ?>" class="screen-reader-text"><?php _e('Select Link Category'); ?></label>
                 <select class="widefat" id="<?php echo $this->get_field_id('category'); ?>" name="<?php echo $this->get_field_name('category'); ?>">

wp-admin/includes/schema.php

@@ -299 +299 @@
         'close_comments_days_old' => 14,
         'thread_comments' => 1,
         'thread_comments_depth' => 5,
-        'page_comments' => 1,
+        'page_comments' => 0,
         'comments_per_page' => 50,
         'default_comments_page' => 'newest',
         'comment_order' => 'asc',