Changes from branches/3.0/wp-content/themes/twentyten/functions.php at r15391 to trunk/wp-content/themes/twentyten/functions.php at r17478

File:

• trunk/wp-content/themes/twentyten/functions.php (modified) (9 diffs)

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

@@ -78 +78 @@
     add_editor_style();
 
+    // Post Format support. You can also use the legacy "gallery" or "asides" (note the plural) categories.
+    add_theme_support( 'post-formats', array( 'aside', 'gallery' ) );
+
     // This theme uses post thumbnails
     add_theme_support( 'post-thumbnails' );
@@ -102 +105 @@
 
     // Your changeable header business starts here
-    define( 'HEADER_TEXTCOLOR', '' );
+    if ( ! defined( 'HEADER_TEXTCOLOR' ) )
+        define( 'HEADER_TEXTCOLOR', '' );
+
     // No CSS, just IMG call. The %s is a placeholder for the theme template directory URI.
-    define( 'HEADER_IMAGE', '%s/images/headers/path.jpg' );
+    if ( ! defined( 'HEADER_IMAGE' ) )
+        define( 'HEADER_IMAGE', '%s/images/headers/path.jpg' );
 
     // The height and width of your custom header. You can hook into the theme's own filters to change these values.
@@ -117 +123 @@
 
     // Don't support text inside the header image.
-    define( 'NO_HEADER_TEXT', true );
+    if ( ! defined( 'NO_HEADER_TEXT' ) )
+        define( 'NO_HEADER_TEXT', true );
 
     // Add a way for the custom header to be styled in the admin panel that controls
@@ -276 +283 @@
  * Remove inline styles printed when the gallery shortcode is used.
  *
- * Galleries are styled by the theme in Twenty Ten's style.css.
- *
- * @since Twenty Ten 1.0
+ * Galleries are styled by the theme in Twenty Ten's style.css. This is just
+ * a simple filter call that tells WordPress to not use the default styles.
+ *
+ * @since Twenty Ten 1.2
+ */
+add_filter( 'use_default_gallery_style', '__return_false' );
+
+/**
+ * Deprecated way to remove inline styles printed when the gallery shortcode is used.
+ *
+ * This function is no longer needed or used. Use the use_default_gallery_style
+ * filter instead, as seen above.
+ *
+ * @since Twenty Ten 1.0
+ * @deprecated Deprecated in Twenty Ten 1.2 for WordPress 3.1
+ *
  * @return string The gallery style filter, with the styles themselves removed.
  */
@@ -284 +304 @@
     return preg_replace( "#<style type='text/css'>(.*?)</style>#s", '', $css );
 }
-add_filter( 'gallery_style', 'twentyten_remove_gallery_css' );
+// Backwards compatibility with WordPress 3.0.
+if ( version_compare( $GLOBALS['wp_version'], '3.1', '<' ) )
+    add_filter( 'gallery_style', 'twentyten_remove_gallery_css' );
 
 if ( ! function_exists( 'twentyten_comment' ) ) :
@@ -309 +331 @@
         </div><!-- .comment-author .vcard -->
         <?php if ( $comment->comment_approved == '0' ) : ?>
-            <em><?php _e( 'Your comment is awaiting moderation.', 'twentyten' ); ?></em>
+            <em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentyten' ); ?></em>
             <br />
         <?php endif; ?>
@@ -333 +355 @@
     ?>
     <li class="post pingback">
-        <p><?php _e( 'Pingback:', 'twentyten' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __('(Edit)', 'twentyten'), ' ' ); ?></p>
+        <p><?php _e( 'Pingback:', 'twentyten' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' ); ?></p>
     <?php
             break;
@@ -425 +447 @@
  * function tied to the widgets_init action hook.
  *
+ * This function uses a filter (show_recent_comments_widget_style) new in WordPress 3.1
+ * to remove the default style. Using Twenty Ten 1.2 in WordPress 3.0 will show the styles,
+ * but they won't have any effect on the widget in default Twenty Ten styling.
+ *
  * @since Twenty Ten 1.0
  */
 function twentyten_remove_recent_comments_style() {
-    global $wp_widget_factory;
-    remove_action( 'wp_head', array( $wp_widget_factory->widgets['WP_Widget_Recent_Comments'], 'recent_comments_style' ) );
+    add_filter( 'show_recent_comments_widget_style', '__return_false' );
 }
 add_action( 'widgets_init', 'twentyten_remove_recent_comments_style' );
@@ -435 +460 @@
 if ( ! function_exists( 'twentyten_posted_on' ) ) :
 /**
- * Prints HTML with meta information for the current post—date/time and author.
+ * Prints HTML with meta information for the current post-date/time and author.
  *
  * @since Twenty Ten 1.0