X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/0461a5f2e55c8d5f1fde96ca2e83117152573c7d..9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f:/wp-content/themes/twentyfourteen/functions.php diff --git a/wp-content/themes/twentyfourteen/functions.php b/wp-content/themes/twentyfourteen/functions.php index d78b44b2..d95d29dc 100644 --- a/wp-content/themes/twentyfourteen/functions.php +++ b/wp-content/themes/twentyfourteen/functions.php @@ -68,7 +68,7 @@ function twentyfourteen_setup() { load_theme_textdomain( 'twentyfourteen', get_template_directory() . '/languages' ); // This theme styles the visual editor to resemble the theme style. - add_editor_style( array( 'css/editor-style.css', twentyfourteen_font_url() ) ); + add_editor_style( array( 'css/editor-style.css', twentyfourteen_font_url(), 'genericons/genericons.css' ) ); // Add RSS feed links to for posts and comments. add_theme_support( 'automatic-feed-links' ); @@ -227,7 +227,7 @@ function twentyfourteen_scripts() { wp_enqueue_style( 'twentyfourteen-lato', twentyfourteen_font_url(), array(), null ); // Add Genericons font, used in the main stylesheet. - wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '3.0.2' ); + wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '3.0.3' ); // Load our main stylesheet. wp_enqueue_style( 'twentyfourteen-style', get_stylesheet_uri(), array( 'genericons' ) ); @@ -256,7 +256,7 @@ function twentyfourteen_scripts() { ) ); } - wp_enqueue_script( 'twentyfourteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20140319', true ); + wp_enqueue_script( 'twentyfourteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20140616', true ); } add_action( 'wp_enqueue_scripts', 'twentyfourteen_scripts' ); @@ -385,7 +385,7 @@ endif; * * Adds body classes to denote: * 1. Single or multiple authors. - * 2. Presence of header image. + * 2. Presence of header image except in Multisite signup and activate pages. * 3. Index views. * 4. Full-width content layout. * 5. Presence of footer widgets. @@ -404,7 +404,7 @@ function twentyfourteen_body_classes( $classes ) { if ( get_header_image() ) { $classes[] = 'header-image'; - } else { + } elseif ( ! in_array( $GLOBALS['pagenow'], array( 'wp-activate.php', 'wp-signup.php' ) ) ) { $classes[] = 'masthead-fixed'; } @@ -463,6 +463,9 @@ add_filter( 'post_class', 'twentyfourteen_post_classes' ); * * @since Twenty Fourteen 1.0 * + * @global int $paged WordPress archive pagination page count. + * @global int $page WordPress paginated post page count. + * * @param string $title Default title text for current view. * @param string $sep Optional separator. * @return string The filtered title. @@ -484,7 +487,7 @@ function twentyfourteen_wp_title( $title, $sep ) { } // Add a page number if necessary. - if ( $paged >= 2 || $page >= 2 ) { + if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) { $title = "$title $sep " . sprintf( __( 'Page %s', 'twentyfourteen' ), max( $paged, $page ) ); }