Changeset 17740

Timestamp:

04/28/2011 11:05:53 AM (15 years ago)

Author:

nacin

Message:

Rename twentyeleven_color_schemes hook to twentyeleven_enqueue_color_scheme, so its purpose is clear. Also rename twentyeleven_color_styles() to twentyeleven_enqueue_color_scheme(), and twentyeleven_link_color() (which sounds like a getter) to twentyeleven_print_link_color_style(). Some tidying in twentyeleven_layout_classes(). see #17198.

File:

• trunk/wp-content/themes/twentyeleven/inc/theme-options.php (modified) (4 diffs)

trunk/wp-content/themes/twentyeleven/inc/theme-options.php

@@ -261 +261 @@
  * @since Twenty Eleven 1.0
  */
-function twentyeleven_color_styles() {
+function twentyeleven_enqueue_color_scheme() {
     $options = twentyeleven_get_theme_options();
     $color_scheme = $options['color_scheme'];
 
     if ( 'dark' == $color_scheme )
-        wp_enqueue_style( 'dark', get_template_directory_uri() . '/colors/dark.css', null, null );
-
-    do_action( 'twentyeleven_color_schemes', $color_scheme );
-}
-add_action( 'wp_enqueue_scripts', 'twentyeleven_color_styles' );
+        wp_enqueue_style( 'dark', get_template_directory_uri() . '/colors/dark.css', array(), null );
+
+    do_action( 'twentyeleven_enqueue_color_scheme', $color_scheme );
+}
+add_action( 'wp_enqueue_scripts', 'twentyeleven_enqueue_color_scheme' );
 
 /**
@@ -279 +279 @@
  * @since Twenty Eleven 1.0
  */
-function twentyeleven_link_color() {
+function twentyeleven_print_link_color_style() {
     $options = twentyeleven_get_theme_options();
     $link_color = $options['link_color'];
@@ -298 +298 @@
 <?php
 }
-add_action( 'wp_head', 'twentyeleven_link_color' );
+add_action( 'wp_head', 'twentyeleven_print_link_color_style' );
 
 /**
@@ -305 +305 @@
  * @since Twenty Eleven 1.0
  */
-function twentyeleven_layout_classes( $classes ) {
+function twentyeleven_layout_classes( $existing_classes ) {
     $options = twentyeleven_get_theme_options();
     $current_layout = $options['theme_layout'];
 
-    $twentyeleven_classes = array();
-
-    $two_column_layouts = array( 'content-sidebar', 'sidebar-content' );
-
-    if ( in_array( $current_layout, $two_column_layouts ) )
-        $twentyeleven_classes[] = 'two-column';
+    if ( in_array( $current_layout, array( 'content-sidebar', 'sidebar-content' ) ) )
+        $classes = array( 'two-column' );
     else
-        $twentyeleven_classes[] = 'one-column';
-
-    $twentyeleven_classes[] = $current_layout;
-
-    $twentyeleven_classes = apply_filters( 'twentyeleven_layout_classes', $twentyeleven_classes, $current_layout );
-
-    return array_merge( $classes, $twentyeleven_classes );
+        $classes = array( 'one-column' );
+
+    $classes[] = $current_layout;
+
+    $classes = apply_filters( 'twentyeleven_layout_classes', $classes, $current_layout );
+
+    return array_merge( $existing_classes, $classes );
 }
 add_filter( 'body_class', 'twentyeleven_layout_classes' );