Ticket #19743: 19743.diff

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

@@ -37 +37 @@
  */
 function twentyeleven_theme_options_init() {
 
-        // 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 twentyeleven_theme_options_render_page()
                 'twentyeleven_theme_options', // Database option, see twentyeleven_get_theme_options()
@@ -239 +235 @@
  * @since Twenty Eleven 1.0
  */
 function twentyeleven_get_theme_options() {
-        return get_option( 'twentyeleven_theme_options', twentyeleven_get_default_theme_options() );
+        $options = get_option( 'twentyeleven_theme_options' );
+
+        if ( false === $options ) {
+                $options = twentyeleven_get_default_theme_options();
+
+                // Since we have no options in the database, let's add them now.
+                if ( is_admin() )
+                        add_option( 'twentyeleven_theme_options', $options );
+        }
+
+        return $options;
 }
 
 /**