Ticket #39272: 39272.6.patch

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.
         register_nav_menus( array(
                 'top'    => __( 'Top Menu', 'twentyseventeen' ),
@@ -199 +202 @@
  */
 function twentyseventeen_content_width() {
 
-        $content_width = 700;
+        $content_width = $GLOBALS['content_width'];
 
-        if ( twentyseventeen_is_frontpage() ) {
-                $content_width = 1120;
+        // 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;
+        }
+
         /**
          * Filter Twenty Seventeen content width of the theme.
          *
@@ -214 +230 @@
          */
         $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 );
 
 /**
  * Register custom fonts.