Ticket #21230: 21230.diff

wp-content/themes/twentytwelve/image.php

@@ -20 +20 @@
 
                                                 <footer class="entry-meta">
                                                         <?php
-                                                                $metadata = wp_get_attachment_metadata();
+                                                                $twentytwelve_metadata = wp_get_attachment_metadata();
                                                                 printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><time class="entry-date" datetime="%1$s" pubdate>%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>', 'twentytwelve' ),
                                                                         esc_attr( get_the_date( 'c' ) ),
                                                                         esc_html( get_the_date() ),
                                                                         esc_url( wp_get_attachment_url() ),
-                                                                        $metadata['width'],
-                                                                        $metadata['height'],
+                                                                        $twentytwelve_metadata['width'],
+                                                                        $twentytwelve_metadata['height'],
                                                                         esc_url( get_permalink( $post->post_parent ) ),
                                                                         esc_attr( strip_tags( get_the_title( $post->post_parent ) ) ),
                                                                         get_the_title( $post->post_parent )
@@ -50 +50 @@
  * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
  * or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
  */
-$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 ) {
-        if ( $attachment->ID == $post->ID )
+$twentytwelve_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 ( $twentytwelve_attachments as $twentytwelve_k => $twentytwelve_attachment ) {
+        if ( $twentytwelve_attachment->ID == $post->ID )
                 break;
 }
-$k++;
+$twentytwelve_k++;
 // If there is more than 1 attachment in a gallery
-if ( count( $attachments ) > 1 ) {
-        if ( isset( $attachments[ $k ] ) )
+if ( count( $twentytwelve_attachments ) > 1 ) {
+        if ( isset( $twentytwelve_attachments[ $twentytwelve_k ] ) )
                 // get the URL of the next image attachment
-                $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+                $twentytwelve_next_attachment_url = get_attachment_link( $twentytwelve_attachments[ $twentytwelve_k ]->ID );
         else
                 // or get the URL of the first image attachment
-                $next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
+                $twentytwelve_next_attachment_url = get_attachment_link( $twentytwelve_attachments[ 0 ]->ID );
 } else {
         // or, if there's only 1 image, get the URL of the image
-        $next_attachment_url = wp_get_attachment_url();
+        $twentytwelve_next_attachment_url = wp_get_attachment_url();
 }
 ?>
-                                                                <a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
-                                                                $attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );
-                                                                echo wp_get_attachment_image( $post->ID, $attachment_size );
+                                                                <a href="<?php echo esc_url( $twentytwelve_next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
+                                                                $twentytwelve_attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );
+                                                                echo wp_get_attachment_image( $post->ID, $twentytwelve_attachment_size );
                                                                 ?></a>
 
                                                                 <?php if ( ! empty( $post->post_excerpt ) ) : ?>

wp-content/themes/twentytwelve/functions.php

@@ -103 +103 @@
          * JavaScript for handling navigation menus and the resized
          * styles for small screen sizes.
          */
-        wp_enqueue_script( 'navigation', get_template_directory_uri() . '/js/theme.js', array( 'jquery' ), '20130320', true );
+        wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/theme.js', array( 'jquery' ), '20130320', true );
 
         /**
          * Load special font CSS file.
@@ -111 +111 @@
          */
         $options = $twentytwelve_options->get_theme_options();
         if ( $options['enable_fonts'] )
-                wp_enqueue_style( 'fonts', 'http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700' );
+                wp_enqueue_style( 'twentytwelve-fonts', 'http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700' );
 
         /**
          * Load our main CSS file.

wp-content/themes/twentytwelve/archive.php

@@ -30 +30 @@
                                         // Show an optional tag description
                                         $tag_description = tag_description();
                                         if ( $tag_description )
-                                                echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
+                                                echo apply_filters( 'twentytwelve_tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
                                 } elseif ( is_category() ) {
                                         printf( __( 'Category Archives: %s', 'twentytwelve' ), '<span>' . single_cat_title( '', false ) . '</span>' );
                                         // Show an optional category description
                                         $category_description = category_description();
                                         if ( $category_description )
-                                                echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
+                                                echo apply_filters( 'twentytwelve_category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
                                 } else {
                                         _e( 'Blog Archives', 'twentytwelve' );
                                 }