diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-content/themes/twentythirteen/functions.php --- a/wp/wp-content/themes/twentythirteen/functions.php Tue Jun 09 11:14:17 2015 +0000 +++ b/wp/wp-content/themes/twentythirteen/functions.php Mon Oct 14 17:39:30 2019 +0200 @@ -28,8 +28,9 @@ * * @see twentythirteen_content_width() for template-specific adjustments. */ -if ( ! isset( $content_width ) ) +if ( ! isset( $content_width ) ) { $content_width = 604; +} /** * Add support for a custom header image. @@ -39,8 +40,9 @@ /** * Twenty Thirteen only works in WordPress 3.6 or later. */ -if ( version_compare( $GLOBALS['wp_version'], '3.6-alpha', '<' ) ) +if ( version_compare( $GLOBALS['wp_version'], '3.6-alpha', '<' ) ) { require get_template_directory() . '/inc/back-compat.php'; +} /** * Twenty Thirteen setup. @@ -61,12 +63,12 @@ /* * Makes Twenty Thirteen available for translation. * - * Translations can be added to the /languages/ directory. + * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentythirteen * If you're building a theme based on Twenty Thirteen, use a find and * replace to change 'twentythirteen' to the name of your theme in all * template files. */ - load_theme_textdomain( 'twentythirteen', get_template_directory() . '/languages' ); + load_theme_textdomain( 'twentythirteen' ); /* * This theme styles the visual editor to resemble the theme style, @@ -81,17 +83,33 @@ * Switches default core markup for search form, comment form, * and comments to output valid HTML5. */ - add_theme_support( 'html5', array( - 'search-form', 'comment-form', 'comment-list', 'gallery', 'caption' - ) ); + add_theme_support( + 'html5', array( + 'search-form', + 'comment-form', + 'comment-list', + 'gallery', + 'caption', + ) + ); /* * This theme supports all available post formats by default. * See https://codex.wordpress.org/Post_Formats */ - add_theme_support( 'post-formats', array( - 'aside', 'audio', 'chat', 'gallery', 'image', 'link', 'quote', 'status', 'video' - ) ); + add_theme_support( + 'post-formats', array( + 'aside', + 'audio', + 'chat', + 'gallery', + 'image', + 'link', + 'quote', + 'status', + 'video', + ) + ); // This theme uses wp_nav_menu() in one location. register_nav_menu( 'primary', __( 'Navigation Menu', 'twentythirteen' ) ); @@ -105,6 +123,9 @@ // This theme uses its own gallery styles. add_filter( 'use_default_gallery_style', '__return_false' ); + + // Indicate widget sidebars can use selective refresh in the Customizer. + add_theme_support( 'customize-selective-refresh-widgets' ); } add_action( 'after_setup_theme', 'twentythirteen_setup' ); @@ -136,17 +157,19 @@ if ( 'off' !== $source_sans_pro || 'off' !== $bitter ) { $font_families = array(); - if ( 'off' !== $source_sans_pro ) + if ( 'off' !== $source_sans_pro ) { $font_families[] = 'Source Sans Pro:300,400,700,300italic,400italic,700italic'; + } - if ( 'off' !== $bitter ) + if ( 'off' !== $bitter ) { $font_families[] = 'Bitter:400,700'; + } $query_args = array( 'family' => urlencode( implode( '|', $font_families ) ), 'subset' => urlencode( 'latin,latin-ext' ), ); - $fonts_url = add_query_arg( $query_args, '//fonts.googleapis.com/css' ); + $fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' ); } return $fonts_url; @@ -162,15 +185,17 @@ * 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' ) ) + if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) { wp_enqueue_script( 'comment-reply' ); + } // Adds Masonry to handle vertical alignment of footer widgets. - if ( is_active_sidebar( 'sidebar-1' ) ) + if ( is_active_sidebar( 'sidebar-1' ) ) { wp_enqueue_script( 'jquery-masonry' ); + } // Loads JavaScript file with functionality specific to Twenty Thirteen. - wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20150330', true ); + wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20160717', true ); // Add Source Sans Pro and Bitter fonts, used in the main stylesheet. wp_enqueue_style( 'twentythirteen-fonts', twentythirteen_fonts_url(), array(), null ); @@ -188,6 +213,31 @@ add_action( 'wp_enqueue_scripts', 'twentythirteen_scripts_styles' ); /** + * Add preconnect for Google Fonts. + * + * @since Twenty Thirteen 2.1 + * + * @param array $urls URLs to print for resource hints. + * @param string $relation_type The relation type the URLs are printed. + * @return array URLs to print for resource hints. + */ +function twentythirteen_resource_hints( $urls, $relation_type ) { + if ( wp_style_is( 'twentythirteen-fonts', 'queue' ) && 'preconnect' === $relation_type ) { + if ( version_compare( $GLOBALS['wp_version'], '4.7-alpha', '>=' ) ) { + $urls[] = array( + 'href' => 'https://fonts.gstatic.com', + 'crossorigin', + ); + } else { + $urls[] = 'https://fonts.gstatic.com'; + } + } + + return $urls; +} +add_filter( 'wp_resource_hints', 'twentythirteen_resource_hints', 10, 2 ); + +/** * Filter the page title. * * Creates a nicely formatted and more specific title element text for output @@ -202,20 +252,23 @@ function twentythirteen_wp_title( $title, $sep ) { global $paged, $page; - if ( is_feed() ) + if ( is_feed() ) { return $title; + } // Add the site name. $title .= get_bloginfo( 'name', 'display' ); // Add the site description for the home/front page. $site_description = get_bloginfo( 'description', 'display' ); - if ( $site_description && ( is_home() || is_front_page() ) ) + if ( $site_description && ( is_home() || is_front_page() ) ) { $title = "$title $sep $site_description"; + } // Add a page number if necessary. - if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) + if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) { $title = "$title $sep " . sprintf( __( 'Page %s', 'twentythirteen' ), max( $paged, $page ) ); + } return $title; } @@ -227,42 +280,47 @@ * @since Twenty Thirteen 1.0 */ function twentythirteen_widgets_init() { - register_sidebar( array( - 'name' => __( 'Main Widget Area', 'twentythirteen' ), - 'id' => 'sidebar-1', - 'description' => __( 'Appears in the footer section of the site.', 'twentythirteen' ), - 'before_widget' => '', - 'before_title' => '

', - 'after_title' => '

', - ) ); + register_sidebar( + array( + 'name' => __( 'Main Widget Area', 'twentythirteen' ), + 'id' => 'sidebar-1', + 'description' => __( 'Appears in the footer section of the site.', 'twentythirteen' ), + 'before_widget' => '', + 'before_title' => '

', + 'after_title' => '

', + ) + ); - register_sidebar( array( - 'name' => __( 'Secondary Widget Area', 'twentythirteen' ), - 'id' => 'sidebar-2', - 'description' => __( 'Appears on posts and pages in the sidebar.', 'twentythirteen' ), - 'before_widget' => '', - 'before_title' => '

', - 'after_title' => '

', - ) ); + register_sidebar( + array( + 'name' => __( 'Secondary Widget Area', 'twentythirteen' ), + 'id' => 'sidebar-2', + 'description' => __( 'Appears on posts and pages in the sidebar.', 'twentythirteen' ), + 'before_widget' => '', + 'before_title' => '

', + 'after_title' => '

', + ) + ); } add_action( 'widgets_init', 'twentythirteen_widgets_init' ); if ( ! function_exists( 'twentythirteen_paging_nav' ) ) : -/** - * Display navigation to next/previous set of posts when applicable. - * - * @since Twenty Thirteen 1.0 - */ -function twentythirteen_paging_nav() { - global $wp_query; + /** + * Display navigation to next/previous set of posts when applicable. + * + * @since Twenty Thirteen 1.0 + */ + function twentythirteen_paging_nav() { + global $wp_query; - // Don't print empty markup if there's only one page. - if ( $wp_query->max_num_pages < 2 ) - return; - ?> -