Ticket #9651: remove-pass-by-reference.diff

widgets.php

@@ -167 +167 @@
                 if ( array_key_exists( $this->number, $settings ) ) {
             $settings = $settings[$this->number];
                         // filters the widget's settings, return false to stop displaying the widget
-                        $settings = apply_filters('widget_display_callback', $settings, &$this);   
+                        $settings = apply_filters('widget_display_callback', $settings, $this);
             if ( false !== $settings )
                                 $this->widget($args, $settings);
         }
@@ -228 +228 @@
                                                 $instance = $this->update($new_instance, array());
 
                                         // filters the widget's settings before saving, return false to cancel saving (keep the old settings if updating)
-                                        $instance = apply_filters('widget_update_callback', $instance, $new_instance, &$this);
+                                        $instance = apply_filters('widget_update_callback', $instance, $new_instance, $this);
                                         if ( false !== $instance )
                                                 $all_instances[$number] = $instance;
                                 }
@@ -258 +258 @@
                 }
 
                 // filters the widget admin form before displaying, return false to stop displaying it
-                $instance = apply_filters('widget_form_callback', $instance, &$this);
+                $instance = apply_filters('widget_form_callback', $instance, $this);
                 if ( false !== $instance )
                         $this->form($instance);
         }
@@ -277 +277 @@
 
         function get_settings() {
                 $settings = get_option($this->option_name);
-                
+
                 if ( false === $settings && isset($this->alt_option_name) )
                         $settings = get_option($this->alt_option_name);
 
@@ -801 +801 @@
  * in which the first instance of the widget with the given callback or $id_base is found.
  * With the $widget_id parameter, returns the ID of the sidebar where
  * the widget with that callback/$id_base AND that ID is found.
- * 
+ *
  * NOTE: $widget_id and $id_base are the same for single widgets. To be effective
  * this function has to run after widgets have initialized, at action 'init' or later.
  *
@@ -1021 +1021 @@
                                 $GLOBALS['_wp_sidebars_widgets'] = get_option('sidebars_widgets');
                         $sidebars_widgets = &$GLOBALS['_wp_sidebars_widgets'];
                 }
-                
+
                 foreach ( (array) $sidebars_widgets as $index => $sidebar ) {
                         if ( is_array($sidebar) ) {
                                 foreach ( $sidebar as $i => $name ) {