Changeset 28527 for trunk/src/wp-includes/widgets.php

Timestamp:

05/19/2014 03:42:00 PM (12 years ago)

Author:

wonderboymusic

Message:

Add public access modifier to methods/members of WP_Widget and WP_Widget_Factory.

See #27881, #22234.

File:

• trunk/src/wp-includes/widgets.php (modified) (17 diffs)

trunk/src/wp-includes/widgets.php

@@ -24 +24 @@
 class WP_Widget {
 
-        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()
-
-        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.
+        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()
+
+        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.
 
         // Member functions that you must over-ride.
@@ -42 +42 @@
          * @param array $instance The settings for the particular instance of the widget
          */
-        function widget($args, $instance) {
+        public function widget($args, $instance) {
                 die('function WP_Widget::widget() must be over-ridden in a sub-class.');
         }
@@ -56 +56 @@
          * @return array Settings to save or bool false to cancel saving
          */
-        function update($new_instance, $old_instance) {
+        public function update($new_instance, $old_instance) {
                 return $new_instance;
         }
@@ -64 +64 @@
          * @param array $instance Current settings
          */
-        function form($instance) {
+        public function form($instance) {
                 echo '<p class="no-options-widget">' . __('There are no options for this widget.') . '</p>';
                 return 'noform';
@@ -84 +84 @@
          *       - height: currently not used but may be needed in the future
          */
-        function __construct( $id_base, $name, $widget_options = array(), $control_options = array() ) {
+        public function __construct( $id_base, $name, $widget_options = array(), $control_options = array() ) {
                 $this->id_base = empty($id_base) ? preg_replace( '/(wp_)?widget_/', '', strtolower(get_class($this)) ) : strtolower($id_base);
                 $this->name = $name;
@@ -95 +95 @@
          * PHP4 constructor
          */
-        function WP_Widget( $id_base, $name, $widget_options = array(), $control_options = array() ) {
+        public function WP_Widget( $id_base, $name, $widget_options = array(), $control_options = array() ) {
                 WP_Widget::__construct( $id_base, $name, $widget_options, $control_options );
         }
@@ -107 +107 @@
          * @return string Name attribute for $field_name
          */
-        function get_field_name($field_name) {
+        public function get_field_name($field_name) {
                 return 'widget-' . $this->id_base . '[' . $this->number . '][' . $field_name . ']';
         }
@@ -119 +119 @@
          * @return string ID attribute for $field_name
          */
-        function get_field_id($field_name) {
+        public function get_field_id($field_name) {
                 return 'widget-' . $this->id_base . '-' . $this->number . '-' . $field_name;
         }
@@ -125 +125 @@
         // Private Functions. Don't worry about these.
 
-        function _register() {
+        public function _register() {
                 $settings = $this->get_settings();
                 $empty = true;
@@ -147 +147 @@
         }
 
-        function _set($number) {
+        public function _set($number) {
                 $this->number = $number;
                 $this->id = $this->id_base . '-' . $number;
         }
 
-        function _get_display_callback() {
+        public function _get_display_callback() {
                 return array($this, 'display_callback');
         }
 
-        function _get_update_callback() {
+        public function _get_update_callback() {
                 return array($this, 'update_callback');
         }
 
-        function _get_form_callback() {
+        public function _get_form_callback() {
                 return array($this, 'form_callback');
         }
@@ -174 +174 @@
          * @return bool True if Customizer is on, false if not.
          */
-        function is_preview() {
+        public function is_preview() {
                 global $wp_customize;
                 return ( isset( $wp_customize ) && $wp_customize->is_preview() ) ;
@@ -182 +182 @@
          *      Just finds the instance and calls widget().
          *      Do NOT over-ride this function. */
-        function display_callback( $args, $widget_args = 1 ) {
+        public function display_callback( $args, $widget_args = 1 ) {
                 if ( is_numeric($widget_args) )
                         $widget_args = array( 'number' => $widget_args );
@@ -230 +230 @@
          * @param mixed $deprecated Not used.
          */
-        function update_callback( $deprecated = 1 ) {
+        public function update_callback( $deprecated = 1 ) {
                 global $wp_registered_widgets;
 
@@ -310 +310 @@
          * Do NOT over-ride this function.
          */
-        function form_callback( $widget_args = 1 ) {
+        public function form_callback( $widget_args = 1 ) {
                 if ( is_numeric($widget_args) )
                         $widget_args = array( 'number' => $widget_args );
@@ -364 +364 @@
 
         /** Helper function: Registers a single instance. */
-        function _register_one($number = -1) {
+        public function _register_one($number = -1) {
                 wp_register_sidebar_widget(     $this->id, $this->name, $this->_get_display_callback(), $this->widget_options, array( 'number' => $number ) );
                 _register_widget_update_callback( $this->id_base, $this->_get_update_callback(), $this->control_options, array( 'number' => -1 ) );
@@ -370 +370 @@
         }
 
-        function save_settings($settings) {
+        public function save_settings($settings) {
                 $settings['_multiwidget'] = 1;
                 update_option( $this->option_name, $settings );
         }
 
-        function get_settings() {
+        public function get_settings() {
                 $settings = get_option($this->option_name);
 
@@ -402 +402 @@
  */
 class WP_Widget_Factory {
-        var $widgets = array();
-
-        function WP_Widget_Factory() {
+        public $widgets = array();
+
+        public function WP_Widget_Factory() {
                 add_action( 'widgets_init', array( $this, '_register_widgets' ), 100 );
         }
 
-        function register($widget_class) {
+        public function register($widget_class) {
                 $this->widgets[$widget_class] = new $widget_class();
         }
 
-        function unregister($widget_class) {
+        public function unregister($widget_class) {
                 if ( isset($this->widgets[$widget_class]) )
                         unset($this->widgets[$widget_class]);
         }
 
-        function _register_widgets() {
+        public function _register_widgets() {
                 global $wp_registered_widgets;
                 $keys = array_keys($this->widgets);