Changeset 23721

Timestamp:

03/15/2013 06:24:45 PM (12 years ago)

Author:

lancewillett

Message:

Twenty Ten: use callback in functions.php to enqueue scripts and styles rather than putting them directly in header.php template file. Props obenland, fixes #23772.

Location:

trunk/wp-content/themes/twentyten

Files:

• functions.php (modified) (1 diff)
• header.php (modified) (1 diff)

trunk/wp-content/themes/twentyten/functions.php

@@ -215 +215 @@
 }
 endif;
+
+/**
+ * Enqueue scripts and styles.
+ *
+ * Hooked on priority 0 to make sure they are enqueued prior to dependent
+ * scripts/styles. This is only necessary because they were previously enqueued
+ * prior to wp_head() running, and we want to provide maximum
+ * backwards compatibility.
+ *
+ * @since Twenty Ten 1.6
+ */
+function twentyten_scripts() {
+    wp_enqueue_style( 'twentyten', get_stylesheet_uri() );
+
+    /* We add some 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' ) )
+        wp_enqueue_script( 'comment-reply' );
+}
+add_action( 'wp_enqueue_scripts', 'twentyten_scripts', 0 );
 
 /**

trunk/wp-content/themes/twentyten/header.php

@@ -15 +15 @@
 <title><?php wp_title( '|', true, 'right' ); ?></title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
-<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
 <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
 <?php
-    /* We add some JavaScript to pages with the comment form
-     * to support sites with threaded comments (when in use).
-     */
-    if ( is_singular() && get_option( 'thread_comments' ) )
-        wp_enqueue_script( 'comment-reply' );
-
     /* Always have wp_head() just before the closing </head>
      * tag of your theme, or you will break many plugins, which