Changeset 6660 for trunk/src/includes/common/widgets.php

Timestamp:

08/20/2017 09:14:42 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Widgets: add isset() checks to checkbox attributes.

This change fixes debug notices when saving Topics & Replies widgets and show_date or show_user are not checked.

Trunk, for 2.6. Props jrf. Fixes #3142.

File:

• trunk/src/includes/common/widgets.php (modified) (2 diffs)

trunk/src/includes/common/widgets.php

@@ -832 +832 @@
                 $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'];
+
+                // Date
+                $instance['show_date'] = isset( $new_instance['show_date'] )
+                        ? (bool) $new_instance['show_date']
+                        : false;
+
+                // Author
+                $instance['show_user'] = isset( $new_instance['show_user'] )
+                        ? (bool) $new_instance['show_user']
+                        : false;
 
                 // Force to any
@@ -1177 +1185 @@
                 $instance              = $old_instance;
                 $instance['title']     = strip_tags( $new_instance['title'] );
-                $instance['show_date'] = (bool) $new_instance['show_date'];
-                $instance['show_user'] = (bool) $new_instance['show_user'];
                 $instance['max_shown'] = (int) $new_instance['max_shown'];
+
+                // Date
+                $instance['show_date'] = isset( $new_instance['show_date'] )
+                        ? (bool) $new_instance['show_date']
+                        : false;
+
+                // Author
+                $instance['show_user'] = isset( $new_instance['show_user'] )
+                        ? (bool) $new_instance['show_user']
+                        : false;
 
                 return $instance;