WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@7713 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-04-16 23:09:51 +00:00
parent 7387154152
commit 957a61318b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/import/blogger.php
View File

@ -770,7 +770,7 @@ class Blogger_Import {
$this->$key = $value; $this->$key = $value;
if ( isset( $_REQUEST['blog'] ) ) { 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; $blog = (int) $blog;
$result = $this->import_blog( $blog ); $result = $this->import_blog( $blog );
if ( is_wp_error( $result ) ) if ( is_wp_error( $result ) )

2
wp-admin/widgets.php
View File

@ -18,7 +18,7 @@ if ( isset($_GET['sidebar']) && isset($wp_registered_sidebars[$_GET['sidebar']])
$sidebar = attribute_escape( $_GET['sidebar'] ); $sidebar = attribute_escape( $_GET['sidebar'] );
} elseif ( is_array($wp_registered_sidebars) && !empty($wp_registered_sidebars) ) { } elseif ( is_array($wp_registered_sidebars) && !empty($wp_registered_sidebars) ) {
// By default we look at the first defined sidebar // 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 { } else {
// If no sidebars, die. // If no sidebars, die.
require_once( 'admin-header.php' ); require_once( 'admin-header.php' );

2
wp-includes/post.php
View File

@ -2425,7 +2425,7 @@ function wp_mime_type_icon( $mime = 0 ) {
$dirs = apply_filters( 'icon_dirs', array($icon_dir => $icon_dir_uri) ); $dirs = apply_filters( 'icon_dirs', array($icon_dir => $icon_dir_uri) );
$icon_files = array(); $icon_files = array();
while ( $dirs ) { while ( $dirs ) {
$dir = array_shift(array_keys($dirs)); $dir = array_shift($keys = array_keys($dirs));
$uri = array_shift($dirs); $uri = array_shift($dirs);
if ( $dh = opendir($dir) ) { if ( $dh = opendir($dir) ) {
while ( false !== $file = readdir($dh) ) { while ( false !== $file = readdir($dh) ) {