<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[21280] trunk/wp-content/themes/twentytwelve/inc/theme-options.php: Twenty Twelve: update theme options file to use PHP5 constructor and visibility keywords, and also minor DocBlock cleanup.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21280">21280</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2012-07-18 18:41:17 +0000 (Wed, 18 Jul 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Twelve: update theme options file to use PHP5 constructor and visibility keywords, and also minor DocBlock cleanup. Props Mamaduka and obenland, closes <a href="http://core.trac.wordpress.org/ticket/21297">#21297</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelveincthemeoptionsphp">trunk/wp-content/themes/twentytwelve/inc/theme-options.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytwelveincthemeoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/inc/theme-options.php (21279 => 21280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/inc/theme-options.php 2012-07-18 18:13:49 UTC (rev 21279)
+++ trunk/wp-content/themes/twentytwelve/inc/theme-options.php 2012-07-18 18:41:17 UTC (rev 21280)
</span><span class="lines">@@ -11,15 +11,28 @@
</span><span class="cx"> /**
</span><span class="cx"> * The option value in the database will be based on get_stylesheet()
</span><span class="cx"> * so child themes don't share the parent theme's option value.
</span><ins>+ *
+ * @access public
+ * @var string
</ins><span class="cx"> */
</span><del>- var $option_key = 'twentytwelve_theme_options';
</del><ins>+ public $option_key = 'twentytwelve_theme_options';
</ins><span class="cx">
</span><span class="cx"> /**
</span><del>- * Initialize our options.
</del><ins>+ * Holds our options.
+ *
+ * @access public
+ * @var array
</ins><span class="cx"> */
</span><del>- var $options = array();
</del><ins>+ public $options = array();
</ins><span class="cx">
</span><del>- function Twenty_Twelve_Options() {
</del><ins>+ /**
+ * Constructor
+ *
+ * @access public
+ *
+ * @return Twenty_Twelve_Options
+ */
+ public function __construct() {
</ins><span class="cx"> // Set option key based on get_stylesheet()
</span><span class="cx"> if ( 'twentytwelve' != get_stylesheet() )
</span><span class="cx"> $this->option_key = get_stylesheet() . '_theme_options';
</span><span class="lines">@@ -37,8 +50,12 @@
</span><span class="cx"> * This call to register_setting() registers a validation callback, validate(),
</span><span class="cx"> * which is used when the option is saved, to ensure that our option values are properly
</span><span class="cx"> * formatted, and safe.
</span><ins>+ *
+ * @access public
+ *
+ * @return void
</ins><span class="cx"> */
</span><del>- function options_init() {
</del><ins>+ public function options_init() {
</ins><span class="cx"> // Load our options for use in any method.
</span><span class="cx"> $this->options = $this->get_theme_options();
</span><span class="cx">
</span><span class="lines">@@ -71,8 +88,12 @@
</span><span class="cx"> * Add our theme options page to the admin menu.
</span><span class="cx"> *
</span><span class="cx"> * This function is attached to the admin_menu action hook.
</span><ins>+ *
+ * @access public
+ *
+ * @return void
</ins><span class="cx"> */
</span><del>- function add_page() {
</del><ins>+ public function add_page() {
</ins><span class="cx"> $theme_page = add_theme_page(
</span><span class="cx"> __( 'Theme Options', 'twentytwelve' ), // Name of page
</span><span class="cx"> __( 'Theme Options', 'twentytwelve' ), // Label in menu
</span><span class="lines">@@ -84,8 +105,12 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Returns the default options.
</span><ins>+ *
+ * @access public
+ *
+ * @return array
</ins><span class="cx"> */
</span><del>- function get_default_theme_options() {
</del><ins>+ public function get_default_theme_options() {
</ins><span class="cx"> $default_theme_options = array(
</span><span class="cx"> 'enable_fonts' => false,
</span><span class="cx"> );
</span><span class="lines">@@ -95,15 +120,23 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Returns the options array.
</span><ins>+ *
+ * @access public
+ *
+ * @return array
</ins><span class="cx"> */
</span><del>- function get_theme_options() {
</del><ins>+ public function get_theme_options() {
</ins><span class="cx"> return get_option( $this->option_key, $this->get_default_theme_options() );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Renders the enable fonts checkbox setting field.
</span><ins>+ *
+ * @access public
+ *
+ * @return void
</ins><span class="cx"> */
</span><del>- function settings_field_enable_fonts() {
</del><ins>+ public function settings_field_enable_fonts() {
</ins><span class="cx"> $options = $this->options;
</span><span class="cx"> ?>
</span><span class="cx"> <label for="enable-fonts">
</span><span class="lines">@@ -117,8 +150,11 @@
</span><span class="cx"> * Returns the options array.
</span><span class="cx"> *
</span><span class="cx"> * @uses get_current_theme() for back compat, fallback for < 3.4
</span><ins>+ * @access public
+ *
+ * @return void
</ins><span class="cx"> */
</span><del>- function render_page() {
</del><ins>+ public function render_page() {
</ins><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="lines">@@ -141,8 +177,12 @@
</span><span class="cx"> * Sanitize and validate form input. Accepts an array, return a sanitized array.
</span><span class="cx"> *
</span><span class="cx"> * @see options_init()
</span><ins>+ * @access public
+ * @param array $input
+ *
+ * @return array The validated data.
</ins><span class="cx"> */
</span><del>- function validate( $input ) {
</del><ins>+ public function validate( $input ) {
</ins><span class="cx"> $output = $defaults = $this->get_default_theme_options();
</span><span class="cx">
</span><span class="cx"> // The enable fonts checkbox should boolean true or false
</span><span class="lines">@@ -154,14 +194,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Implement Twenty Twelve theme options into Theme Customizer
</del><ins>+ * Implement Twenty Twelve theme options into Theme Customizer.
</ins><span class="cx"> *
</span><del>- * @param $wp_customize Theme Customizer object
</del><ins>+ * @since Twenty Twelve 1.0
+ * @access public
+ * @param WP_Customize_Manager $wp_customize Theme Customizer object.
+ *
</ins><span class="cx"> * @return void
</span><del>- *
- * @since Twenty Twelve 1.0
</del><span class="cx"> */
</span><del>- function customize_register( $wp_customize ) {
</del><ins>+ public function customize_register( $wp_customize ) {
</ins><span class="cx"> // Enable Web Fonts
</span><span class="cx"> $wp_customize->add_section( $this->option_key . '_enable_fonts', array(
</span><span class="cx"> 'title' => __( 'Fonts', 'twentytwelve' ),
</span></span></pre>
</div>
</div>
</body>
</html>