Changeset 17734

Timestamp:

04/28/2011 08:52:37 AM (15 years ago)

Author:

nacin

Message:

Twenty Eleven:

• Use add_option(), rather than get_option() with defaults, to prevent notoption queries.
• Add twentyeleven_theme_options_validate filter, that way one doesn't need to add a filter to sanitize_option_\$option to allow more options in.
• Some inline doc modifications and additions.

see #17198.

File:

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

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

@@ -38 +38 @@
  * formatted, and safe.
  *
+ * We also use this function to add our theme option if it doesn't already exist.
+ *
  * @since Twenty Eleven 1.0
  */
 function twentyeleven_theme_options_init() {
-    register_setting( 'twentyeleven_options', 'twentyeleven_theme_options', 'twentyeleven_theme_options_validate' );
+
+    // If we have no options in the database, let's add them now.
+    if ( false === twentyeleven_get_theme_options() )
+        add_option( 'twentyeleven_theme_options', twentyeleven_get_default_theme_options() );
+
+    register_setting(
+        'twentyeleven_options',       // Options group, see settings_fields() call in theme_options_render_page()
+        'twentyeleven_theme_options', // Database option, see twentyeleven_get_theme_options()
+        'twentyeleven_theme_options_validate' // The sanitization callback, see twentyeleven_theme_options_validate()
+    );
 }
 add_action( 'admin_init', 'twentyeleven_theme_options_init' );
@@ -120 +131 @@
     $default_theme_options = array(
         'color_scheme' => 'light',
-        'link_color' => '#1b8be0',
+        'link_color'   => '#1b8be0',
         'theme_layout' => 'content-sidebar',
     );
@@ -133 +144 @@
  */
 function twentyeleven_get_theme_options() {
-    $defaults = twentyeleven_get_default_theme_options();
-    $options = get_option( 'twentyeleven_theme_options', $defaults );
-
-    return $options;
+    return get_option( 'twentyeleven_theme_options' );
 }
 
@@ -229 +237 @@
  * @todo set up Reset Options action
  *
- * @since Twenty Ten 1.0
+ * @since Twenty Eleven 1.0
  */
 function twentyeleven_theme_options_validate( $input ) {
-    $output = twentyeleven_get_default_theme_options();
+    $output = $defaults = twentyeleven_get_default_theme_options();
 
     // Color scheme must be in our array of color scheme options
@@ -246 +254 @@
         $output['theme_layout'] = $input['theme_layout'];
 
-    return $output;
-}
-
-/**
- * Register our color schemes and add them to the queue
+    return apply_filters( 'twentyeleven_theme_options_validate', $output, $input, $defaults );
+}
+
+/**
+ * Enqueue the styles for the current color scheme.
+ *
+ * @since Twenty Eleven 1.0
  */
 function twentyeleven_color_styles() {
@@ -292 +302 @@
 
 /**
- *  Adds Twenty Ten layout classes to the array of body classes
+ * Adds Twenty Eleven layout classes to the array of body classes.
  *
  * @since Twenty Eleven 1.0