Changeset 17738

Timestamp:

04/28/2011 09:47:30 AM (14 years ago)

Author:

nacin

Message:

In Twenty Eleven: Register the widget from functions.php. Kill create_function. Attach twentyeleven_widgets_init() to widgets_init, rather than init. Eliminate use of the $post global in the widget. see #17198.

Location:

trunk/wp-content/themes/twentyeleven

Files:

• functions.php (modified) (2 diffs)
• inc/widgets.php (modified) (3 diffs)

trunk/wp-content/themes/twentyeleven/functions.php

@@ -367 +367 @@
 
 /**
- * Register widgetized area and update sidebar with default widgets
+ * Register our sidebars and widgetized areas. Also register the default Epherma widget.
+ *
+ * @since Twenty Eleven 1.0
  */
 function twentyeleven_widgets_init() {
+
+    register_widget( 'Twenty_Eleven_Ephemera_Widget' );
+
     register_sidebar( array(
         'name' => __( 'Main Sidebar', 'twentyeleven' ),
@@ -419 +424 @@
     ) );
 }
-add_action( 'init', 'twentyeleven_widgets_init' );
+add_action( 'widgets_init', 'twentyeleven_widgets_init' );
 
 /**

trunk/wp-content/themes/twentyeleven/inc/widgets.php

@@ -79 +79 @@
         echo $after_title;
 
-        global $post;
-
         ?>
         <ol>
         <?php while ( $ephemera->have_posts() ) : $ephemera->the_post(); ?>
 
-            <?php if ( 'link' != get_post_format( $post->ID ) ) : ?>
+            <?php if ( 'link' != get_post_format() ) : ?>
 
             <li class="entry-title">
@@ -117 +115 @@
         echo $after_widget;
 
-        // Reset the global $the_post as this query will have stomped on it
+        // Reset the post globals as this query will have stomped on it
         wp_reset_postdata();
 
@@ -163 +161 @@
     }
 }
-
-add_action( 'widgets_init', create_function( '', "register_widget( 'Twenty_Eleven_Ephemera_Widget' );" ) );