Ticket #21297: 21297.2.diff

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

@@ -12 +12 @@
          * The option value in the database will be based on get_stylesheet()
          * so child themes don't share the parent theme's option value.
          */
-        var $option_key = 'twentytwelve_theme_options';
+        public $option_key = 'twentytwelve_theme_options';
 
         /**
          * Initialize our options.
          */
-        var $options = array();
+        public $options = array();
 
-        function Twenty_Twelve_Options() {
+        public function __construct() {
                 // Set option key based on get_stylesheet()
                 if ( 'twentytwelve' != get_stylesheet() )
                         $this->option_key = get_stylesheet() . '_theme_options';
@@ -38 +38 @@
          * which is used when the option is saved, to ensure that our option values are properly
          * formatted, and safe.
          */
-        function options_init() {
+        public function options_init() {
                 // Load our options for use in any method.
                 $this->options = $this->get_theme_options();
 
@@ -72 +72 @@
          *
          * This function is attached to the admin_menu action hook.
          */
-        function add_page() {
+        public function add_page() {
                 $theme_page = add_theme_page(
                         __( 'Theme Options', 'twentytwelve' ), // Name of page
                         __( 'Theme Options', 'twentytwelve' ), // Label in menu
@@ -85 +85 @@
         /**
          * Returns the default options.
          */
-        function get_default_theme_options() {
+        public function get_default_theme_options() {
                 $default_theme_options = array(
                         'enable_fonts' => false,
                 );
@@ -96 +96 @@
         /**
          * Returns the options array.
          */
-        function get_theme_options() {
+        public function get_theme_options() {
                 return get_option( $this->option_key, $this->get_default_theme_options() );
         }
 
         /**
          * Renders the enable fonts checkbox setting field.
          */
-        function settings_field_enable_fonts() {
+        public function settings_field_enable_fonts() {
                 $options = $this->options;
                 ?>
                 <label for="enable-fonts">
@@ -118 +118 @@
          *
          * @uses get_current_theme() for back compat, fallback for < 3.4
          */
-        function render_page() {
+        public function render_page() {
                 ?>
                 <div class="wrap">
                         <?php screen_icon(); ?>
@@ -142 +142 @@
          *
          * @see options_init()
          */
-        function validate( $input ) {
+        public function validate( $input ) {
                 $output = $defaults = $this->get_default_theme_options();
 
                 // The enable fonts checkbox should boolean true or false
@@ -161 +161 @@
          *
          * @since Twenty Twelve 1.0
          */
-        function customize_register( $wp_customize ) {
+        public function customize_register( $wp_customize ) {
                 // Enable Web Fonts
                 $wp_customize->add_section( $this->option_key . '_enable_fonts', array(
                         'title'    => __( 'Fonts', 'twentytwelve' ),