Ticket #25256: twentytwelve.3.diff

src/wp-content/themes/twentytwelve/comments.php

@@ -12 +12 @@
  * @since Twenty Twelve 1.0
  */
 
-/**
- * If the current post is protected by a password and
+/* If the current post is protected by a password and
  * the visitor has not yet entered the password we will
  * return early without loading the comments.
  */

src/wp-content/themes/twentytwelve/functions.php

@@ -22 +22 @@
  * @since Twenty Twelve 1.0
  */
 
-/**
- * Set up the content width value based on the theme's design and stylesheet.
- */
+// Set up the content width value based on the theme's design and stylesheet.
 if ( ! isset( $content_width ) )
         $content_width = 625;
 
@@ -44 +42 @@
  * @since Twenty Twelve 1.0
  */
 function twentytwelve_setup() {
-        /**
-         * Makes Twenty Twelve available for translation.
+        /* Makes Twenty Twelve available for translation.
          *
          * Translations can be added to the /languages/ directory.
          * If you're building a theme based on Twenty Twelve, use a find and replace
@@ -65 +62 @@
         // This theme uses wp_nav_menu() in one location.
         register_nav_menu( 'primary', __( 'Primary Menu', 'twentytwelve' ) );
 
-        /**
-         * This theme supports custom background color and image,
+        /* This theme supports custom background color and image,
          * and here we also set up the default background color.
          */
         add_theme_support( 'custom-background', array(
@@ -97 +93 @@
 function twentytwelve_get_font_url() {
         $font_url = '';
 
-        /**
-         * translators: If there are characters in your language that are not supported
+        /* translators: If there are characters in your language that are not supported
          * by Open Sans, translate this to 'off'. Do not translate into your own language.
          */
         if ( 'off' !== _x( 'on', 'Open Sans font: on or off', 'twentytwelve' ) ) {
                 $subsets = 'latin,latin-ext';
 
-                /**
-                 * translators: To add an additional Open Sans character subset specific to your language,
+                /* translators: To add an additional Open Sans character subset specific to your language,
                  * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
                  */
                 $subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
@@ -138 +132 @@
 function twentytwelve_scripts_styles() {
         global $wp_styles;
 
-        /**
-         * Adds JavaScript to pages with the comment form to support
+        /* Adds JavaScript to pages with the comment form to support
          * sites with threaded comments (when in use).
          */
         if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
                 wp_enqueue_script( 'comment-reply' );
 
-        /**
-         * Adds JavaScript for handling the navigation menu hide-and-show behavior.
-         */
+        // Adds JavaScript for handling the navigation menu hide-and-show behavior.
         wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '1.0', true );
 
         $font_url = twentytwelve_get_font_url();
         if ( ! empty( $font_url ) )
                 wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null );
 
-        /**
-         * Loads our main stylesheet.
-         */
+        // Loads our main stylesheet.
         wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
 
-        /**
-         * Loads the Internet Explorer specific stylesheet.
-         */
+        // Loads the Internet Explorer specific stylesheet.
         wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), '20121010' );
         $wp_styles->add_data( 'twentytwelve-ie', 'conditional', 'lt IE 9' );
 }

src/wp-content/themes/twentytwelve/image.php

@@ -48 +48 @@
                                                 <div class="entry-attachment">
                                                         <div class="attachment">
 <?php
-/**
- * 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,
+/* 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' ) ) );

src/wp-content/themes/twentytwelve/sidebar-front.php

@@ -9 +9 @@
  * @since Twenty Twelve 1.0
  */
 
-/**
- * The front page widget area is triggered if any of the areas
+/* The front page widget area is triggered if any of the areas
  * have widgets. So let's check that first.
  *
  * If none of the sidebars have widgets, then let's bail early.

src/wp-content/themes/twentytwelve/tag.php

@@ -29 +29 @@
                         /* Start the Loop */
                         while ( have_posts() ) : the_post();
 
-                                /**
-                                 * Include the post format-specific template for the content. If you want to
+                                /* Include the post format-specific template for the content. If you want to
                                  * this in a child theme then include a file called called content-___.php
                                  * (where ___ is the post format) and that will be used instead.
                                  */