Changeset 7077

Timestamp:

02/27/08 23:57:00 (9 months ago)

Author:

ryan

Message:

fix new-fangled multi widgets. Props mdawaffe. see #6022

Files:

• trunk/wp-admin/edit-pages.php (modified) (2 diffs)
• trunk/wp-includes/widgets.php (modified) (8 diffs)

trunk/wp-admin/edit-pages.php

@@ -123 +123 @@
-<?php
-$query_str = "post_type=page&orderby=menu_order title&what_to_show=posts$post_status_q&posts_per_page=-1&posts_per_archive_page=-1&order=asc";
+if ( !empty($_GET['p']) ) {
+    $query_str .= "p=
+}
-$query_str = apply_filters('manage_pages_query', $query_str);
-wp($query_str);
@@ -161 +164 @@
-</div>
-
+<?php
+if ( 1 == count($posts) && isset( $_GET['p'] ) ) {
+
+    $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved != 'spam' ORDER BY comment_date");
+    if ($comments) {
+        // Make sure comments, post, and post_author are cached
+        update_comment_cache($comments);
+        $post = get_post($id);
+        $authordata = get_userdata($post->post_author);
+    ?>
+<h3 id="comments"><?php _e('Comments') ?></h3>
+<ol id="the-comment-list" class="list:comment commentlist">
+<?php
+        $i = 0;
+        foreach ( $comments as $comment ) {
+            _wp_comment_list_item( $comment->comment_ID, ++$i );
+        }
+    echo '</ol>';
+    } // end if comments
+?>
+<?php } ?>
+
-</div>
-

trunk/wp-includes/widgets.php

@@ -648 +648 @@
-    $name = __('Text');
-
-
-
-
-
-
-
+
-    foreach ( array_keys($options) as $o ) {
-        // Old widgets can have null values for some reason
@@ -661 +656 @@
-        wp_register_sidebar_widget($id, $name, 'wp_widget_text', $widget_ops, array( 'number' => $o ));
-        wp_register_widget_control($id, $name, 'wp_widget_text_control', $control_ops, array( 'number' => $o ));
+    }
+
+    // If there are none, we register the widget's existance with a generic template
+    if ( !$id ) {
+        wp_register_sidebar_widget( 'text-1', $name, 'wp_widget_text', $widget_ops, array( 'number' => -1 ) );
+        wp_register_widget_control( 'text-1', $name, 'wp_widget_text_control', $control_ops, array( 'number' => -1 ) );
-    }
-}
@@ -809 +810 @@
-    $name = __( 'Categories' );
-
-
-
-
-
-
-
+
-    foreach ( array_keys($options) as $o ) {
-        // Old widgets can have null values for some reason
@@ -824 +820 @@
-    }
-
+    // If there are none, we register the widget's existance with a generic template
+    if ( !$id ) {
+        wp_register_sidebar_widget( 'categories-1', $name, 'wp_widget_categories', $widget_ops, array( 'number' => -1 ) );
+        wp_register_widget_control( 'categories-1', $name, 'wp_widget_categories_control', array( 'id_base' => 'categories' ), array( 'number' => -1 ) );
+    }
-}
-
@@ -1298 +1299 @@
-    $name = __('RSS');
-
-
-
-
-
-
-
+
-    foreach ( array_keys($options) as $o ) {
-        // Old widgets can have null values for some reason
@@ -1311 +1307 @@
-        wp_register_sidebar_widget($id, $name, 'wp_widget_rss', $widget_ops, array( 'number' => $o ));
-        wp_register_widget_control($id, $name, 'wp_widget_rss_control', $control_ops, array( 'number' => $o ));
+    }
+
+    // If there are none, we register the widget's existance with a generic template
+    if ( !$id ) {
+        wp_register_sidebar_widget( 'rss-1', $name, 'wp_widget_rss', $widget_ops, array( 'number' => -1 ) );
+        wp_register_widget_control( 'rss-1', $name, 'wp_widget_rss_control', $control_ops, array( 'number' => -1 ) );
-    }
-}
@@ -1490 +1492 @@
-    $name = __('Many');
-
-
-
-
-
-
-
+
-    foreach ( array_keys($options) as $o ) {
-        // Old widgets can have null values for some reason
@@ -1503 +1500 @@
-        // $id should look like {$id_base}-{$o}
-        $id = "many-$o"; // Never never never translate an id
+        $registered = true;
-        wp_register_sidebar_widget( $id, $name, 'wp_widget_text', $widget_ops, array( 'number' => $o ) );
-        wp_register_widget_control( $id, $name, 'wp_widget_text_control', $control_ops, array( 'number' => $o ) );
-    }
+
+    // If there are none, we register the widget's existance with a generic template
+    if ( !$registered ) {
+        wp_register_sidebar_widget( 'many-1', $name, 'widget_many', $widget_ops, array( 'number' => -1 ) );
+        wp_register_widget_control( 'many-1', $name, 'widget_many_control', $control_ops, array( 'number' => -1 ) );
+    }
-}
-