Changeset 25240

Timestamp:

09/04/2013 07:06:13 PM (13 years ago)

Author:

wonderboymusic

Message:

Remove unnecessary checks before setting $wp_settings_* arrays. Adds unit test for setting a nonexistent variable to a multi-dimensional array.

Props scribu.
Fixes #17884.

Location:

trunk

Files:

• src/wp-admin/includes/template.php (modified) (5 diffs)
• tests/phpunit/tests/basic.php (modified) (1 diff)

trunk/src/wp-admin/includes/template.php

@@ -1073 +1073 @@
         }
 
-        if ( !isset($wp_settings_sections) )
-                $wp_settings_sections = array();
-        if ( !isset($wp_settings_sections[$page]) )
-                $wp_settings_sections[$page] = array();
-        if ( !isset($wp_settings_sections[$page][$id]) )
-                $wp_settings_sections[$page][$id] = array();
-
         $wp_settings_sections[$page][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback);
 }
@@ -1118 +1111 @@
         }
 
-        if ( !isset($wp_settings_fields) )
-                $wp_settings_fields = array();
-        if ( !isset($wp_settings_fields[$page]) )
-                $wp_settings_fields[$page] = array();
-        if ( !isset($wp_settings_fields[$page][$section]) )
-                $wp_settings_fields[$page][$section] = array();
-
         $wp_settings_fields[$page][$section][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $args);
 }
@@ -1144 +1130 @@
         global $wp_settings_sections, $wp_settings_fields;
 
-        if ( ! isset( $wp_settings_sections ) || !isset( $wp_settings_sections[$page] ) )
+        if ( ! isset( $wp_settings_sections[$page] ) )
                 return;
 
@@ -1179 +1165 @@
         global $wp_settings_fields;
 
-        if ( !isset($wp_settings_fields) || !isset($wp_settings_fields[$page]) || !isset($wp_settings_fields[$page][$section]) )
+        if ( ! isset( $wp_settings_fields[$page][$section] ) )
                 return;
 
@@ -1219 +1205 @@
 function add_settings_error( $setting, $code, $message, $type = 'error' ) {
         global $wp_settings_errors;
-
-        if ( !isset($wp_settings_errors) )
-                $wp_settings_errors = array();
 
         $new_error = array(

trunk/tests/phpunit/tests/basic.php

@@ -89 +89 @@
                 $this->assertEquals($expected, mask_input_value($in));
         }
+
+        function test_setting_nonexistent_arrays() {
+                $page = 1;
+                $field = 'settings';
+
+                error_reporting( -1 );
+
+                $empty_array[$page][$field] = 'foo';
+
+                unset( $empty_array[$page]['bar']['baz'] );
+        }
 }