<!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>[28527] trunk/src/wp-includes/widgets.php: Add `public` access modifier to methods/members of `WP_Widget` and `WP_Widget_Factory`.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/28527">28527</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-19 15:42:00 +0000 (Mon, 19 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add `public` access modifier to methods/members of `WP_Widget` and `WP_Widget_Factory`.
See <a href="http://core.trac.wordpress.org/ticket/27881">#27881</a>, <a href="http://core.trac.wordpress.org/ticket/22234">#22234</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludeswidgetsphp">trunk/src/wp-includes/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/widgets.php (28526 => 28527)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/widgets.php 2014-05-19 15:35:29 UTC (rev 28526)
+++ trunk/src/wp-includes/widgets.php 2014-05-19 15:42:00 UTC (rev 28527)
</span><span class="lines">@@ -23,14 +23,14 @@
</span><span class="cx"> */
</span><span class="cx"> class WP_Widget {
</span><span class="cx">
</span><del>- var $id_base; // Root id for all widgets of this type.
- var $name; // Name for this widget type.
- var $widget_options; // Option array passed to wp_register_sidebar_widget()
- var $control_options; // Option array passed to wp_register_widget_control()
</del><ins>+ public $id_base; // Root id for all widgets of this type.
+ public $name; // Name for this widget type.
+ public $widget_options; // Option array passed to wp_register_sidebar_widget()
+ public $control_options; // Option array passed to wp_register_widget_control()
</ins><span class="cx">
</span><del>- var $number = false; // Unique ID number of the current instance.
- var $id = false; // Unique ID string of the current instance (id_base-number)
- var $updated = false; // Set true when we update the data after a POST submit - makes sure we don't do it twice.
</del><ins>+ public $number = false; // Unique ID number of the current instance.
+ public $id = false; // Unique ID string of the current instance (id_base-number)
+ public $updated = false; // Set true when we update the data after a POST submit - makes sure we don't do it twice.
</ins><span class="cx">
</span><span class="cx"> // Member functions that you must over-ride.
</span><span class="cx">
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> * @param array $args Display arguments including before_title, after_title, before_widget, and after_widget.
</span><span class="cx"> * @param array $instance The settings for the particular instance of the widget
</span><span class="cx"> */
</span><del>- function widget($args, $instance) {
</del><ins>+ public function widget($args, $instance) {
</ins><span class="cx"> die('function WP_Widget::widget() must be over-ridden in a sub-class.');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> * @param array $old_instance Old settings for this instance
</span><span class="cx"> * @return array Settings to save or bool false to cancel saving
</span><span class="cx"> */
</span><del>- function update($new_instance, $old_instance) {
</del><ins>+ public function update($new_instance, $old_instance) {
</ins><span class="cx"> return $new_instance;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param array $instance Current settings
</span><span class="cx"> */
</span><del>- function form($instance) {
</del><ins>+ public function form($instance) {
</ins><span class="cx"> echo '<p class="no-options-widget">' . __('There are no options for this widget.') . '</p>';
</span><span class="cx"> return 'noform';
</span><span class="cx"> }
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> * - width: required if more than 250px
</span><span class="cx"> * - height: currently not used but may be needed in the future
</span><span class="cx"> */
</span><del>- function __construct( $id_base, $name, $widget_options = array(), $control_options = array() ) {
</del><ins>+ public function __construct( $id_base, $name, $widget_options = array(), $control_options = array() ) {
</ins><span class="cx"> $this->id_base = empty($id_base) ? preg_replace( '/(wp_)?widget_/', '', strtolower(get_class($this)) ) : strtolower($id_base);
</span><span class="cx"> $this->name = $name;
</span><span class="cx"> $this->option_name = 'widget_' . $this->id_base;
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * PHP4 constructor
</span><span class="cx"> */
</span><del>- function WP_Widget( $id_base, $name, $widget_options = array(), $control_options = array() ) {
</del><ins>+ public function WP_Widget( $id_base, $name, $widget_options = array(), $control_options = array() ) {
</ins><span class="cx"> WP_Widget::__construct( $id_base, $name, $widget_options, $control_options );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> * @param string $field_name Field name
</span><span class="cx"> * @return string Name attribute for $field_name
</span><span class="cx"> */
</span><del>- function get_field_name($field_name) {
</del><ins>+ public function get_field_name($field_name) {
</ins><span class="cx"> return 'widget-' . $this->id_base . '[' . $this->number . '][' . $field_name . ']';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -118,13 +118,13 @@
</span><span class="cx"> * @param string $field_name Field name
</span><span class="cx"> * @return string ID attribute for $field_name
</span><span class="cx"> */
</span><del>- function get_field_id($field_name) {
</del><ins>+ public function get_field_id($field_name) {
</ins><span class="cx"> return 'widget-' . $this->id_base . '-' . $this->number . '-' . $field_name;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Private Functions. Don't worry about these.
</span><span class="cx">
</span><del>- function _register() {
</del><ins>+ public function _register() {
</ins><span class="cx"> $settings = $this->get_settings();
</span><span class="cx"> $empty = true;
</span><span class="cx">
</span><span class="lines">@@ -146,20 +146,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function _set($number) {
</del><ins>+ public function _set($number) {
</ins><span class="cx"> $this->number = $number;
</span><span class="cx"> $this->id = $this->id_base . '-' . $number;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function _get_display_callback() {
</del><ins>+ public function _get_display_callback() {
</ins><span class="cx"> return array($this, 'display_callback');
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function _get_update_callback() {
</del><ins>+ public function _get_update_callback() {
</ins><span class="cx"> return array($this, 'update_callback');
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function _get_form_callback() {
</del><ins>+ public function _get_form_callback() {
</ins><span class="cx"> return array($this, 'form_callback');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @return bool True if Customizer is on, false if not.
</span><span class="cx"> */
</span><del>- function is_preview() {
</del><ins>+ public function is_preview() {
</ins><span class="cx"> global $wp_customize;
</span><span class="cx"> return ( isset( $wp_customize ) && $wp_customize->is_preview() ) ;
</span><span class="cx"> }
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> /** Generate the actual widget content.
</span><span class="cx"> * Just finds the instance and calls widget().
</span><span class="cx"> * Do NOT over-ride this function. */
</span><del>- function display_callback( $args, $widget_args = 1 ) {
</del><ins>+ public function display_callback( $args, $widget_args = 1 ) {
</ins><span class="cx"> if ( is_numeric($widget_args) )
</span><span class="cx"> $widget_args = array( 'number' => $widget_args );
</span><span class="cx">
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param mixed $deprecated Not used.
</span><span class="cx"> */
</span><del>- function update_callback( $deprecated = 1 ) {
</del><ins>+ public function update_callback( $deprecated = 1 ) {
</ins><span class="cx"> global $wp_registered_widgets;
</span><span class="cx">
</span><span class="cx"> $all_instances = $this->get_settings();
</span><span class="lines">@@ -309,7 +309,7 @@
</span><span class="cx"> *
</span><span class="cx"> * Do NOT over-ride this function.
</span><span class="cx"> */
</span><del>- function form_callback( $widget_args = 1 ) {
</del><ins>+ public function form_callback( $widget_args = 1 ) {
</ins><span class="cx"> if ( is_numeric($widget_args) )
</span><span class="cx"> $widget_args = array( 'number' => $widget_args );
</span><span class="cx">
</span><span class="lines">@@ -363,18 +363,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Helper function: Registers a single instance. */
</span><del>- function _register_one($number = -1) {
</del><ins>+ public function _register_one($number = -1) {
</ins><span class="cx"> wp_register_sidebar_widget( $this->id, $this->name, $this->_get_display_callback(), $this->widget_options, array( 'number' => $number ) );
</span><span class="cx"> _register_widget_update_callback( $this->id_base, $this->_get_update_callback(), $this->control_options, array( 'number' => -1 ) );
</span><span class="cx"> _register_widget_form_callback( $this->id, $this->name, $this->_get_form_callback(), $this->control_options, array( 'number' => $number ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function save_settings($settings) {
</del><ins>+ public function save_settings($settings) {
</ins><span class="cx"> $settings['_multiwidget'] = 1;
</span><span class="cx"> update_option( $this->option_name, $settings );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_settings() {
</del><ins>+ public function get_settings() {
</ins><span class="cx"> $settings = get_option($this->option_name);
</span><span class="cx">
</span><span class="cx"> if ( false === $settings && isset($this->alt_option_name) )
</span><span class="lines">@@ -401,22 +401,22 @@
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> */
</span><span class="cx"> class WP_Widget_Factory {
</span><del>- var $widgets = array();
</del><ins>+ public $widgets = array();
</ins><span class="cx">
</span><del>- function WP_Widget_Factory() {
</del><ins>+ public function WP_Widget_Factory() {
</ins><span class="cx"> add_action( 'widgets_init', array( $this, '_register_widgets' ), 100 );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function register($widget_class) {
</del><ins>+ public function register($widget_class) {
</ins><span class="cx"> $this->widgets[$widget_class] = new $widget_class();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function unregister($widget_class) {
</del><ins>+ public function unregister($widget_class) {
</ins><span class="cx"> if ( isset($this->widgets[$widget_class]) )
</span><span class="cx"> unset($this->widgets[$widget_class]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function _register_widgets() {
</del><ins>+ public function _register_widgets() {
</ins><span class="cx"> global $wp_registered_widgets;
</span><span class="cx"> $keys = array_keys($this->widgets);
</span><span class="cx"> $registered = array_keys($wp_registered_widgets);
</span></span></pre>
</div>
</div>
</body>
</html>