Changeset 39650 for branches/4.7

Timestamp:

12/30/2016 05:46:58 AM (10 years ago)

Author:

dd32

Message:

Twenty Seventeen: Fix incorrect $content_width value in theme.

This addresses a major bug. Incorrectly setting the $content_width causes media embeds to end up with the wrong aspect ratio, among other issues. This fix uses template_redirect, to ensure conditional theme tags can be used. It also defines a default value at after_theme_setup so that plugins have something to work with at init.

Props sstoqnov, laurelfulford, obenland.
Merges [39635] to the 4.7 branch.
Fixes #39272.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-content/themes/twentyseventeen/functions.php (modified) (3 diffs)

branches/4.7/src/wp-content/themes/twentyseventeen/functions.php

@@ -55 +55 @@
 
         add_image_size( 'twentyseventeen-thumbnail-avatar', 100, 100, true );
+
+        // Set the default content width.
+        $GLOBALS['content_width'] = 525;
 
         // This theme uses wp_nav_menu() in two locations.
@@ -200 +203 @@
 function twentyseventeen_content_width() {
 
-        $content_width = 700;
-
-        if ( twentyseventeen_is_frontpage() ) {
-                $content_width = 1120;
+        $content_width = $GLOBALS['content_width'];
+
+        // Get layout.
+        $page_layout = get_theme_mod( 'page_layout' );
+
+        // Check if layout is one column.
+        if ( 'one-column' === $page_layout ) {
+                if ( twentyseventeen_is_frontpage() ) {
+                        $content_width = 644;
+                } elseif ( is_page() ) {
+                        $content_width = 740;
+                }
+        }
+
+        // Check if is single post and there is no sidebar.
+        if ( is_single() && ! is_active_sidebar( 'sidebar-1' ) ) {
+                $content_width = 740;
         }
 
@@ -215 +231 @@
         $GLOBALS['content_width'] = apply_filters( 'twentyseventeen_content_width', $content_width );
 }
-add_action( 'after_setup_theme', 'twentyseventeen_content_width', 0 );
+add_action( 'template_redirect', 'twentyseventeen_content_width', 0 );
 
 /**