Changeset 26225

Timestamp:

11/15/2013 09:14:49 PM (10 years ago)

Author:

lancewillett

Message:

Twenty Fourteen: limit back compat to 3.6 and later versions. See #26055, props obenland.

Location:

trunk/src/wp-content/themes/twentyfourteen

Files:

• functions.php (modified) (3 diffs)
• inc/back-compat.php (added)
• inc/widgets.php (modified) (2 diffs)

trunk/src/wp-content/themes/twentyfourteen/functions.php

@@ -34 +34 @@
 if ( ! isset( $content_width ) )
     $content_width = 474;
+
+/**
+ * Twenty Fourteen only works in WordPress 3.6 or later.
+ */
+if ( version_compare( $GLOBALS['wp_version'], '3.6', '<' ) )
+    require get_template_directory() . '/inc/back-compat.php';
 
 if ( ! function_exists( 'twentyfourteen_setup' ) ) :
@@ -218 +224 @@
  */
 function twentyfourteen_scripts() {
-    global $wp_styles;
-
     // Add Lato font, used in the main stylesheet.
     wp_enqueue_style( 'twentyfourteen-lato', twentyfourteen_font_url(), array(), null );
@@ -231 +235 @@
     // Load the Internet Explorer specific stylesheet.
     wp_enqueue_style( 'twentyfourteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfourteen-style' ), '20131110' );
-    $wp_styles->add_data( 'twentyfourteen-ie', 'conditional', 'lt IE 9' );
+    wp_style_add_data( 'twentyfourteen-ie', 'conditional', 'lt IE 9' );
 
     if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )

trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php

@@ -132 +132 @@
                                     $images = array();
 
-                                    if ( function_exists( 'get_post_galleries' ) ) {
-                                        $galleries = get_post_galleries( get_the_ID(), false );
-                                        if ( isset( $galleries[0]['ids'] ) )
-                                            $images = explode( ',', $galleries[0]['ids'] );
-                                    } else {
-                                        $pattern = get_shortcode_regex();
-                                        preg_match( "/$pattern/s", get_the_content(), $match );
-                                        $atts = shortcode_parse_atts( $match[3] );
-                                        if ( isset( $atts['ids'] ) )
-                                            $images = explode( ',', $atts['ids'] );
-                                    }
+                                    $galleries = get_post_galleries( get_the_ID(), false );
+                                    if ( isset( $galleries[0]['ids'] ) )
+                                        $images = explode( ',', $galleries[0]['ids'] );
 
                                     if ( ! $images ) :
                                         $images = get_posts( array(
                                             'fields'         => 'ids',
-                                            'numberposts'    => 999,
+                                            'numberposts'    => -1,
                                             'order'          => 'ASC',
                                             'orderby'        => 'menu_order',
@@ -167 +159 @@
                                     if ( ! empty ( $post_thumbnail ) ) :
                         ?>
-                                    <a href="<?php the_permalink(); ?>"><?php echo $post_thumbnail; ?></a>
-                                <?php
-                                    endif;
-                                ?>
-                                    <p class="wp-caption-text">
-                                    <?php
-                                        printf( _n( 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photo</a>.', 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photos</a>.', $total_images, 'twentyfourteen' ),
-                                            esc_url( get_permalink() ),
-                                            number_format_i18n( $total_images )
-                                        );
-                                    ?>
-                                    </p>
+                        <a href="<?php the_permalink(); ?>"><?php echo $post_thumbnail; ?></a>
+                        <?php endif; ?>
+                        <p class="wp-caption-text">
                             <?php
+                                printf( _n( 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photo</a>.', 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photos</a>.', $total_images, 'twentyfourteen' ),
+                                    esc_url( get_permalink() ),
+                                    number_format_i18n( $total_images )
+                                );
+                            ?>
+                        </p>
+                        <?php
                                 endif;