Changeset 14433 for trunk/wp-content/themes/twentyten/functions.php

Timestamp:

05/04/2010 07:01:09 AM (16 years ago)

Author:

nacin

Message:

Twenty Ten spacing and string cleanups. props zeo, markmcwilliams. see #13198. Add a twentyten_credits filter, props nathanrice, fixes #12804. Also clean up the generator/credits string.

File:

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

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

@@ -105 +105 @@
         // The height and width of your custom header. You can hook into the theme's own filters to change these values.
         // Add a filter to twentyten_header_image_width and twentyten_header_image_height to change these values.
-        define( 'HEADER_IMAGE_WIDTH', apply_filters( 'twentyten_header_image_width',  940 ) );
-        define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyten_header_image_height',  198 ) );
+        define( 'HEADER_IMAGE_WIDTH', apply_filters( 'twentyten_header_image_width', 940 ) );
+        define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyten_header_image_height', 198 ) );
 
         // We'll be using post thumbnails for custom header images on posts and pages.
@@ -228 +228 @@
  */
 function twentyten_excerpt_more( $more ) {
-        return '&nbsp;&hellip; <a href="'. get_permalink() . '">' . __('Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten') . '</a>';
+        return ' &hellip; <a href="'. get_permalink() . '">' . __('Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten') . '</a>';
 }
 add_filter( 'excerpt_more', 'twentyten_excerpt_more' );
@@ -269 +269 @@
                 <?php endif; ?>
 
-                <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"><?php printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(),  get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'twentyten' ),'  ','' ); ?></div>
+                <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"><?php printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(),  get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' ); ?></div>
 
                 <div class="comment-body"><?php comment_text(); ?></div>
@@ -280 +280 @@
         <?php else : ?>
         <li class="post pingback">
-                <p><?php _e( 'Pingback: ', 'twentyten' ); ?><?php comment_author_link(); ?><?php edit_comment_link ( __('edit', 'twentyten'), '&nbsp;&nbsp;', '' ); ?></p>
+                <p><?php _e( 'Pingback:', 'twentyten' ); ?> <?php comment_author_link(); ?><?php edit_comment_link ( __('(Edit)', 'twentyten'), ' ' ); ?></p>
         <?php endif;
 }
@@ -295 +295 @@
         // Area 1
         register_sidebar( array (
-                'name' => __( 'Primary Widget Area' , 'twentyten' ),
+                'name' => __( 'Primary Widget Area', 'twentyten' ),
                 'id' => 'primary-widget-area',
-                'description' => __( 'The primary widget area' , 'twentyten' ),
+                'description' => __( 'The primary widget area', 'twentyten' ),
                 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                 'after_widget' => "</li>",
@@ -306 +306 @@
         // Area 2
         register_sidebar( array (
-                'name' => __( 'Secondary Widget Area' , 'twentyten' ),
+                'name' => __( 'Secondary Widget Area', 'twentyten' ),
                 'id' => 'secondary-widget-area',
-                'description' => __( 'The secondary widget area' , 'twentyten' ),
+                'description' => __( 'The secondary widget area', 'twentyten' ),
                 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                 'after_widget' => "</li>",
@@ -317 +317 @@
         // Area 3
         register_sidebar( array (
-                'name' => __( 'First Footer Widget Area' , 'twentyten' ),
+                'name' => __( 'First Footer Widget Area', 'twentyten' ),
                 'id' => 'first-footer-widget-area',
-                'description' => __( 'The first footer widget area' , 'twentyten' ),
+                'description' => __( 'The first footer widget area', 'twentyten' ),
                 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                 'after_widget' => "</li>",
@@ -328 +328 @@
         // Area 4
         register_sidebar( array (
-                'name' => __( 'Second Footer Widget Area' , 'twentyten' ),
+                'name' => __( 'Second Footer Widget Area', 'twentyten' ),
                 'id' => 'second-footer-widget-area',
-                'description' => __( 'The second footer widget area' , 'twentyten' ),
+                'description' => __( 'The second footer widget area', 'twentyten' ),
                 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                 'after_widget' => "</li>",
@@ -339 +339 @@
         // Area 5
         register_sidebar( array (
-                'name' => __( 'Third Footer Widget Area' , 'twentyten' ),
+                'name' => __( 'Third Footer Widget Area', 'twentyten' ),
                 'id' => 'third-footer-widget-area',
-                'description' => __( 'The third footer widget area' , 'twentyten' ),
+                'description' => __( 'The third footer widget area', 'twentyten' ),
                 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                 'after_widget' => "</li>",
@@ -350 +350 @@
         // Area 6
         register_sidebar( array (
-                'name' => __( 'Fourth Footer Widget Area' , 'twentyten' ),
+                'name' => __( 'Fourth Footer Widget Area', 'twentyten' ),
                 'id' => 'fourth-footer-widget-area',
-                'description' => __( 'The fourth footer widget area' , 'twentyten' ),
+                'description' => __( 'The fourth footer widget area', 'twentyten' ),
                 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
                 'after_widget' => "</li>",
@@ -376 +376 @@
         global $post;
         $post = get_post($post);
-        $attachments = array_values(get_children( array('post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID') ));
+        $attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
  
-        foreach ( $attachments as $k => $attachment )
+        foreach ( $attachments as $k => $attachment ) {
                 if ( $attachment->ID == $post->ID )
                         break;
-
-                $k = $k + 1;
-  
-                if ( isset($attachments[$k]) ) {
-                        return get_attachment_link($attachments[$k]->ID);               
-                } else {
-                        return get_permalink($post->post_parent);
-                }
-}
+        }
+        $k++;
+        if ( isset( $attachments[ $k ] ) )
+                return get_attachment_link( $attachments[ $k ]->ID );
+        else
+                return get_permalink( $post->post_parent );
+}