Changeset 7712

Timestamp:

04/16/2008 11:09:37 PM (18 years ago)

Author:

ryan

Message:

array_shift() error fixes from DD32. fixes #6499 for 2.5

Location:

branches/2.5

Files:

• wp-admin/import/blogger.php (modified) (1 diff)
• wp-admin/widgets.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)

branches/2.5/wp-admin/import/blogger.php

@@ -771 +771 @@
 
         if ( isset( $_REQUEST['blog'] ) ) {
-            $blog = is_array($_REQUEST['blog']) ? array_shift( array_keys( $_REQUEST['blog'] ) ) : $_REQUEST['blog'];
+            $blog = is_array($_REQUEST['blog']) ? array_shift( $keys = array_keys( $_REQUEST['blog'] ) ) : $_REQUEST['blog'];
             $blog = (int) $blog;
             $result = $this->import_blog( $blog );

branches/2.5/wp-admin/widgets.php

@@ -19 +19 @@
 } elseif ( is_array($wp_registered_sidebars) && !empty($wp_registered_sidebars) ) {
     // By default we look at the first defined sidebar
-    $sidebar = array_shift( array_keys($wp_registered_sidebars) );
+    $sidebar = array_shift( $keys = array_keys($wp_registered_sidebars) );
 } else {
     // If no sidebars, die.

branches/2.5/wp-includes/post.php

@@ -2426 +2426 @@
             $icon_files = array();
             while ( $dirs ) {
-                $dir = array_shift(array_keys($dirs));
+                $dir = array_shift($keys = array_keys($dirs));
                 $uri = array_shift($dirs);
                 if ( $dh = opendir($dir) ) {