Ticket #6499: 6499.2.diff

wp-admin/import/blogger.php

@@ -770 +770 @@
                                 $this->$key = $value;
 
                 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 );
                         if ( is_wp_error( $result ) )

wp-admin/widgets.php

@@ -18 +18 @@
         $sidebar = attribute_escape( $_GET['sidebar'] );
 } 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.
         require_once( 'admin-header.php' );

wp-includes/post.php

@@ -2408 +2408 @@
                         $dirs = apply_filters( 'icon_dirs', array($icon_dir => $icon_dir_uri) );
                         $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) ) {
                                         while ( false !== $file = readdir($dh) ) {