Changeset 4886

Timestamp:

05/06/2013 03:47:42 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Fix a few widget fields that were not saving correctly. Props alex-ye. Fixes #2319 (2.3 branch)

File:

• branches/2.3/includes/common/widgets.php (modified) (5 diffs)

branches/2.3/includes/common/widgets.php

@@ -162 +162 @@
         $instance             = $old_instance;
         $instance['title']    = strip_tags( $new_instance['title'] );
-        $instance['register'] = esc_url( $new_instance['register'] );
-        $instance['lostpass'] = esc_url( $new_instance['lostpass'] );
+        $instance['register'] = esc_url_raw( $new_instance['register'] );
+        $instance['lostpass'] = esc_url_raw( $new_instance['lostpass'] );
 
         return $instance;
@@ -601 +601 @@
         $instance                 = $old_instance;
         $instance['title']        = strip_tags( $new_instance['title'] );
-        $instance['parent_forum'] = $new_instance['parent_forum'];
+        $instance['parent_forum'] = sanitize_text_field( $new_instance['parent_forum'] );
 
         // Force to any
@@ -835 +835 @@
      */
     public function update( $new_instance = array(), $old_instance = array() ) {
-        $instance              = $old_instance;
-        $instance['title']     = strip_tags( $new_instance['title'] );
-        $instance['order_by']  = strip_tags( $new_instance['order_by'] );
-        $instance['show_date'] = (bool) $new_instance['show_date'];
-        $instance['show_user'] = (bool) $new_instance['show_user'];
-        $instance['max_shown'] = (int) $new_instance['max_shown'];
+        $instance                 = $old_instance;
+        $instance['title']        = strip_tags( $new_instance['title'] );
+        $instance['order_by']     = strip_tags( $new_instance['order_by'] );
+        $instance['parent_forum'] = sanitize_text_field( $new_instance['parent_forum'] );
+        $instance['show_date']    = (bool) $new_instance['show_date'];
+        $instance['show_user']    = (bool) $new_instance['show_user'];
+        $instance['max_shown']    = (int) $new_instance['max_shown'];
 
         // Force to any
-        if ( !empty( $instance['parent_forum'] ) || !is_numeric( $instance['parent_forum'] ) ) {
+        if ( !empty( $instance['parent_forum'] ) && !is_numeric( $instance['parent_forum'] ) ) {
             $instance['parent_forum'] = 'any';
-        } else {
-            $instance['parent_forum'] = (int) $new_instance['parent_forum'];
         }
 
@@ -879 +878 @@
         </p>
 
-        <p><label for="<?php echo $this->get_field_id( 'show_date' ); ?>"><?php _e( 'Show post date:',    'bbpress' ); ?> <input type="checkbox" id="<?php echo $this->get_field_id( 'show_date' ); ?>" name="<?php echo $this->get_field_name( 'show_date' ); ?>" <?php checked( 'on', $settings['show_date'] ); ?> /></label></p>
-        <p><label for="<?php echo $this->get_field_id( 'show_user' ); ?>"><?php _e( 'Show topic author:', 'bbpress' ); ?> <input type="checkbox" id="<?php echo $this->get_field_id( 'show_user' ); ?>" name="<?php echo $this->get_field_name( 'show_user' ); ?>" <?php checked( 'on', $settings['show_user'] ); ?> /></label></p>
+        <p><label for="<?php echo $this->get_field_id( 'show_date' ); ?>"><?php _e( 'Show post date:',    'bbpress' ); ?> <input type="checkbox" id="<?php echo $this->get_field_id( 'show_date' ); ?>" name="<?php echo $this->get_field_name( 'show_date' ); ?>" <?php checked( true, $settings['show_date'] ); ?> value="1" /></label></p>
+        <p><label for="<?php echo $this->get_field_id( 'show_user' ); ?>"><?php _e( 'Show topic author:', 'bbpress' ); ?> <input type="checkbox" id="<?php echo $this->get_field_id( 'show_user' ); ?>" name="<?php echo $this->get_field_name( 'show_user' ); ?>" <?php checked( true, $settings['show_user'] ); ?> value="1" /></label></p>
 
         <p>
@@ -1225 +1224 @@
         <p><label for="<?php echo $this->get_field_id( 'title'     ); ?>"><?php _e( 'Title:',                   'bbpress' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title'     ); ?>" name="<?php echo $this->get_field_name( 'title'     ); ?>" type="text" value="<?php echo esc_attr( $settings['title']     ); ?>" /></label></p>
         <p><label for="<?php echo $this->get_field_id( 'max_shown' ); ?>"><?php _e( 'Maximum replies to show:', 'bbpress' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_shown' ); ?>" name="<?php echo $this->get_field_name( 'max_shown' ); ?>" type="text" value="<?php echo esc_attr( $settings['max_shown'] ); ?>" /></label></p>
-        <p><label for="<?php echo $this->get_field_id( 'show_date' ); ?>"><?php _e( 'Show post date:',          'bbpress' ); ?> <input type="checkbox" id="<?php echo $this->get_field_id( 'show_date' ); ?>" name="<?php echo $this->get_field_name( 'show_date' ); ?>" <?php checked( 'on', $settings['show_date'] ); ?> /></label></p>
-        <p><label for="<?php echo $this->get_field_id( 'show_user' ); ?>"><?php _e( 'Show reply author:',       'bbpress' ); ?> <input type="checkbox" id="<?php echo $this->get_field_id( 'show_user' ); ?>" name="<?php echo $this->get_field_name( 'show_user' ); ?>" <?php checked( 'on', $settings['show_user'] ); ?> /></label></p>
+        <p><label for="<?php echo $this->get_field_id( 'show_date' ); ?>"><?php _e( 'Show post date:',          'bbpress' ); ?> <input type="checkbox" id="<?php echo $this->get_field_id( 'show_date' ); ?>" name="<?php echo $this->get_field_name( 'show_date' ); ?>" <?php checked( true, $settings['show_date'] ); ?> value="1" /></label></p>
+        <p><label for="<?php echo $this->get_field_id( 'show_user' ); ?>"><?php _e( 'Show reply author:',       'bbpress' ); ?> <input type="checkbox" id="<?php echo $this->get_field_id( 'show_user' ); ?>" name="<?php echo $this->get_field_name( 'show_user' ); ?>" <?php checked( true, $settings['show_user'] ); ?> value="1" /></label></p>
 
         <?php