Index: capabilities.php =================================================================== --- capabilities.php (revision 8483) +++ capabilities.php (working copy) @@ -28,7 +28,7 @@ $this->role_objects = array(); $this->role_names = array(); - foreach ($this->roles as $role => $data) { + foreach ( (array) $this->roles as $role => $data) { $this->role_objects[$role] = new WP_Role($role, $this->roles[$role]['capabilities']); $this->role_names[$role] = $this->roles[$role]['name']; } @@ -207,7 +207,7 @@ } function set_role($role) { - foreach($this->roles as $oldrole) + foreach( (array) $this->roles as $oldrole) unset($this->caps[$oldrole]); if ( !empty($role) ) { $this->caps[$role] = true; @@ -265,7 +265,7 @@ $caps = call_user_func_array('map_meta_cap', $args); // Must have ALL requested caps $capabilities = apply_filters('user_has_cap', $this->allcaps, $caps, $args); - foreach ($caps as $cap) { + foreach ( (array) $caps as $cap) { //echo "Checking cap $cap
"; if(empty($capabilities[$cap]) || !$capabilities[$cap]) return false; Index: category-template.php =================================================================== --- category-template.php (revision 8483) +++ category-template.php (working copy) @@ -7,7 +7,7 @@ $chain = ''; // TODO: consult hierarchy $cat_ids = get_all_category_ids(); - foreach ( $cat_ids as $cat_id ) { + foreach ( (array) $cat_ids as $cat_id ) { if ( $cat_id == $id ) continue; @@ -84,7 +84,7 @@ else $categories = array(); - foreach(array_keys($categories) as $key) { + foreach( (array) array_keys($categories) as $key) { _make_cat_compat($categories[$key]); } Index: category.php =================================================================== --- category.php (revision 8483) +++ category.php (working copy) @@ -43,7 +43,7 @@ $taxonomy = 'category'; if ( 'link' == $args['type'] ) $taxonomy = 'link_category'; - $categories = get_terms($taxonomy, $args); + $categories = (array) get_terms($taxonomy, $args); foreach ( array_keys($categories) as $k ) _make_cat_compat($categories[$k]); Index: classes.php =================================================================== --- classes.php (revision 8483) +++ classes.php (working copy) @@ -90,7 +90,7 @@ // Look for matches. $request_match = $request; - foreach ($rewrite as $match => $query) { + foreach ( (array) $rewrite as $match => $query) { // Don't try to match against AtomPub calls if ( $req_uri == 'wp-app.php' ) break; @@ -171,7 +171,7 @@ } } - foreach ($this->private_query_vars as $var) { + foreach ( (array) $this->private_query_vars as $var) { if (isset($this->extra_query_vars[$var])) $this->query_vars[$var] = $this->extra_query_vars[$var]; elseif (isset($GLOBALS[$var]) && '' != $GLOBALS[$var]) @@ -242,7 +242,7 @@ function build_query_string() { $this->query_string = ''; - foreach (array_keys($this->query_vars) as $wpvar) { + foreach ( (array) array_keys($this->query_vars) as $wpvar) { if ( '' != $this->query_vars[$wpvar] ) { $this->query_string .= (strlen($this->query_string) < 1) ? '' : '&'; if ( !is_scalar($this->query_vars[$wpvar]) ) // Discard non-scalars. @@ -261,7 +261,7 @@ function register_globals() { global $wp_query; // Extract updated query vars back into global namespace. - foreach ($wp_query->query_vars as $key => $value) { + foreach ( (array) $wp_query->query_vars as $key => $value) { $GLOBALS[$key] = $value; } @@ -350,7 +350,7 @@ // Return all messages if no code specified. if ( empty($code) ) { $all_messages = array(); - foreach ( $this->errors as $code => $messages ) + foreach ( (array) $this->errors as $code => $messages ) $all_messages = array_merge($all_messages, $messages); return $all_messages; @@ -534,7 +534,7 @@ * if we are displaying all levels, and remaining children_elements is not empty, * then we got orphans, which should be displayed regardless */ - if ( ( $max_depth == 0 ) && sizeof( $children_elements ) > 0 ) { + if ( ( $max_depth == 0 ) && count( $children_elements ) > 0 ) { $empty_array = array(); foreach ( $children_elements as $orphan_e ) $this->display_element( $orphan_e, $empty_array, 1, 0, $args, $output ); @@ -755,7 +755,7 @@ $response = ''; if ( is_wp_error($data) ) { - foreach ( $data->get_error_codes() as $code ) { + foreach ( (array) $data->get_error_codes() as $code ) { $response .= "get_error_message($code) . "]]>"; if ( !$error_data = $data->get_error_data($code) ) continue; @@ -781,7 +781,7 @@ } $s = ''; - if ( (array) $supplemental ) { + if ( is_array($supplemental) ) { foreach ( $supplemental as $k => $v ) $s .= "<$k>"; $s = "$s"; @@ -805,7 +805,7 @@ function send() { header('Content-Type: text/xml'); echo ""; - foreach ( $this->responses as $response ) + foreach ( (array) $this->responses as $response ) echo $response; echo ''; die(); Index: comment-template.php =================================================================== --- comment-template.php (revision 8483) +++ comment-template.php (working copy) @@ -107,7 +107,7 @@ */ function get_comment_author_link() { /** @todo Only call these functions when they are needed. Include in if... else blocks */ - $url = get_comment_author_url(); + $url = get_comment_author_url(); $author = get_comment_author(); if ( empty( $url ) || 'http://' == $url ) @@ -769,4 +769,4 @@ echo ''; } -?> \ No newline at end of file +?> Index: comment.php =================================================================== --- comment.php (revision 8483) +++ comment.php (working copy) @@ -51,7 +51,7 @@ if ( !empty($mod_keys) ) { $words = explode("\n", $mod_keys ); - foreach ($words as $word) { + foreach ( (array) $words as $word) { $word = trim($word); // Skip empty lines @@ -1190,7 +1190,7 @@ // http://dummy-weblog.org/post.php // We don't wanna ping first and second types, even if they have a valid - foreach ( $post_links_temp[0] as $link_test ) : + foreach ( (array) $post_links_temp[0] as $link_test ) : if ( !in_array($link_test, $pung) && (url_to_postid($link_test) != $post_ID) // If we haven't pung it already and it isn't a link to itself && !is_local_attachment($link_test) ) : // Also, let's never ping local attachments. $test = parse_url($link_test); Index: cron.php =================================================================== --- cron.php (revision 8483) +++ cron.php (working copy) @@ -121,7 +121,7 @@ $schedules = wp_get_schedules(); foreach ( $crons as $timestamp => $cronhooks ) { if ( $timestamp > time() ) break; - foreach ( $cronhooks as $hook => $args ) { + foreach ( (array) $cronhooks as $hook => $args ) { if ( isset($schedules[$hook]['callback']) && !call_user_func( $schedules[$hook]['callback'] ) ) continue; spawn_cron(); @@ -178,8 +178,8 @@ $new_cron = array(); - foreach ($cron as $timestamp => $hooks) { - foreach ( $hooks as $hook => $args ) { + foreach ( (array) $cron as $timestamp => $hooks) { + foreach ( (array) $hooks as $hook => $args ) { $key = md5(serialize($args['args'])); $new_cron[$timestamp][$hook][$key] = $args; } Index: feed.php =================================================================== --- feed.php (revision 8483) +++ feed.php (working copy) @@ -398,9 +398,9 @@ if ( !empty($post->post_password) && (!isset($_COOKIE['wp-postpass_'.COOKIEHASH]) || $_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password) ) return; - foreach (get_post_custom() as $key => $val) { + foreach ( (array) get_post_custom() as $key => $val) { if ($key == 'enclosure') { - foreach ((array)$val as $enc) { + foreach ( (array) $val as $enc ) { $enclosure = split("\n", $enc); echo apply_filters('rss_enclosure', '' . "\n"); } @@ -430,9 +430,9 @@ if ( !empty($post->post_password) && ($_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password) ) return; - foreach (get_post_custom() as $key => $val) { + foreach ( (array) get_post_custom() as $key => $val ) { if ($key == 'enclosure') { - foreach ((array)$val as $enc) { + foreach ( (array) $val as $enc ) { $enclosure = split("\n", $enc); echo apply_filters('atom_enclosure', '' . "\n"); } @@ -501,4 +501,4 @@ . wp_specialchars(stripslashes($_SERVER['REQUEST_URI']), 1); } -?> \ No newline at end of file +?> Index: formatting.php =================================================================== --- formatting.php (revision 8483) +++ formatting.php (working copy) @@ -708,7 +708,7 @@ function convert_smilies($text) { global $wp_smiliessearch, $wp_smiliesreplace; - $output = ''; + $output = ''; if ( get_option('use_smilies') && !empty($wp_smiliessearch) && !empty($wp_smiliesreplace) ) { // HTML loop taken from texturize function, could possible be consolidated $textarr = preg_split("/(<.*>)/U", $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between Index: functions.php =================================================================== --- functions.php (revision 8483) +++ functions.php (working copy) @@ -421,7 +421,7 @@ $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" ); $wpdb->show_errors($show); - foreach ( $options as $option ) { + foreach ( (array) $options as $option ) { // "When trying to design a foolproof system, // never underestimate the ingenuity of the fools :)" -- Dougal if ( in_array( $option->option_name, array( 'siteurl', 'home', 'category_base', 'tag_base' ) ) ) @@ -777,7 +777,7 @@ debug_fwrite( $log, 'Post contents:' ); debug_fwrite( $log, $content . "\n" ); - foreach ( $post_links_temp[0] as $link_test ) { + foreach ( (array) $post_links_temp[0] as $link_test ) { if ( !in_array( $link_test, $pung ) ) { // If we haven't pung it already $test = parse_url( $link_test ); if ( isset( $test['query'] ) ) @@ -787,7 +787,7 @@ } } - foreach ( $post_links as $url ) { + foreach ( (array) $post_links as $url ) { if ( $url != '' && !$wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE (%s)", $post_ID, $url . '%' ) ) ) { if ( $headers = wp_get_http_headers( $url) ) { $len = (int) $headers['content-length']; @@ -1007,7 +1007,7 @@ $qs[func_get_arg( 0 )] = func_get_arg( 1 ); } - foreach ( $qs as $k => $v ) { + foreach ( (array) $qs as $k => $v ) { if ( $v === false ) unset( $qs[$k] ); } @@ -1031,7 +1031,7 @@ */ function remove_query_arg( $key, $query=false ) { if ( is_array( $key ) ) { // removing multiple keys - foreach ( (array) $key as $k ) + foreach ( $key as $k ) $query = add_query_arg( $k, false, $query ); return $query; } @@ -1049,7 +1049,7 @@ function add_magic_quotes( $array ) { global $wpdb; - foreach ( $array as $k => $v ) { + foreach ( (array) $array as $k => $v ) { if ( is_array( $v ) ) { $array[$k] = add_magic_quotes( $v ); } else { @@ -2329,4 +2329,4 @@ return $url; } -?> \ No newline at end of file +?> Index: general-template.php =================================================================== --- general-template.php (revision 8483) +++ general-template.php (working copy) @@ -426,7 +426,7 @@ } if ( $arcresults ) { $afterafter = $after; - foreach ( $arcresults as $arcresult ) { + foreach ( (array) $arcresults as $arcresult ) { $url = get_month_link($arcresult->year, $arcresult->month); $text = sprintf(__('%1$s %2$d'), $wp_locale->get_month($arcresult->month), $arcresult->year); if ( $show_post_count ) @@ -447,7 +447,7 @@ } if ($arcresults) { $afterafter = $after; - foreach ($arcresults as $arcresult) { + foreach ( (array) $arcresults as $arcresult) { $url = get_year_link($arcresult->year); $text = sprintf('%d', $arcresult->year); if ($show_post_count) @@ -468,7 +468,7 @@ } if ( $arcresults ) { $afterafter = $after; - foreach ( $arcresults as $arcresult ) { + foreach ( (array) $arcresults as $arcresult ) { $url = get_day_link($arcresult->year, $arcresult->month, $arcresult->dayofmonth); $date = sprintf('%1$d-%2$02d-%3$02d 00:00:00', $arcresult->year, $arcresult->month, $arcresult->dayofmonth); $text = mysql2date($archive_day_date_format, $date); @@ -492,7 +492,7 @@ $arc_w_last = ''; $afterafter = $after; if ( $arcresults ) { - foreach ( $arcresults as $arcresult ) { + foreach ( (array) $arcresults as $arcresult ) { if ( $arcresult->week != $arc_w_last ) { $arc_year = $arcresult->yr; $arc_w_last = $arcresult->week; @@ -520,7 +520,7 @@ $arcresults = $cache[ $key ]; } if ( $arcresults ) { - foreach ( $arcresults as $arcresult ) { + foreach ( (array) $arcresults as $arcresult ) { if ( $arcresult->post_date != '0000-00-00 00:00:00' ) { $url = get_permalink($arcresult); $arc_title = $arcresult->post_title; @@ -660,7 +660,7 @@ AND post_type = 'post' AND post_status = 'publish' AND post_date < '" . current_time('mysql') . '\'', ARRAY_N); if ( $dayswithposts ) { - foreach ( $dayswithposts as $daywith ) { + foreach ( (array) $dayswithposts as $daywith ) { $daywithpost[] = $daywith[0]; } } else { @@ -681,7 +681,7 @@ ."AND post_type = 'post' AND post_status = 'publish'" ); if ( $ak_post_titles ) { - foreach ( $ak_post_titles as $ak_post_title ) { + foreach ( (array) $ak_post_titles as $ak_post_title ) { $post_title = apply_filters( "the_title", $ak_post_title->post_title ); $post_title = str_replace('"', '"', wptexturize( $post_title )); @@ -748,7 +748,7 @@ function allowed_tags() { global $allowedtags; $allowed = ''; - foreach ( $allowedtags as $tag => $attributes ) { + foreach ( (array) $allowedtags as $tag => $attributes ) { $allowed .= '<'.$tag; if ( 0 < count($attributes) ) { foreach ( $attributes as $attribute => $limits ) { @@ -1058,7 +1058,7 @@ extract($args, EXTR_SKIP); // Who knows what else people pass in $args - $total = (int) $total; + $total = (int) $total; if ( $total < 2 ) return; $current = (int) $current; Index: kses.php =================================================================== --- kses.php (revision 8483) +++ kses.php (working copy) @@ -793,11 +793,11 @@ function wp_kses_array_lc($inarray) { $outarray = array (); - foreach ($inarray as $inkey => $inval) { + foreach ( (array) $inarray as $inkey => $inval) { $outkey = strtolower($inkey); $outarray[$outkey] = array (); - foreach ($inval as $inkey2 => $inval2) { + foreach ( (array) $inval as $inkey2 => $inval2) { $outkey2 = strtolower($inkey2); $outarray[$outkey][$outkey2] = $inval2; } # foreach $inval Index: locale.php =================================================================== --- locale.php (revision 8483) +++ locale.php (working copy) @@ -190,7 +190,7 @@ $this->number_format['thousands_sep'] = ('number_format_thousands_sep' == $trans) ? ',' : $trans; // Import global locale vars set during inclusion of $locale.php. - foreach ( $this->locale_vars as $var ) { + foreach ( (array) $this->locale_vars as $var ) { if ( isset($GLOBALS[$var]) ) $this->$var = $GLOBALS[$var]; } Index: pluggable.php =================================================================== --- pluggable.php (revision 8483) +++ pluggable.php (working copy) @@ -789,7 +789,7 @@ $found = true; while($found) { $found = false; - foreach($strip as $val) { + foreach( (array) $strip as $val) { while(strpos($location, $val) !== false) { $found = true; $location = str_replace($val, '', $location); @@ -1562,4 +1562,4 @@ } endif; -?> \ No newline at end of file +?> Index: plugin.php =================================================================== --- plugin.php (revision 8483) +++ plugin.php (working copy) @@ -90,7 +90,7 @@ if ( !$idx = _wp_filter_build_unique_id($tag, $function_to_check, false) ) return false; - foreach ( array_keys($wp_filter[$tag]) as $priority ) { + foreach ( (array) array_keys($wp_filter[$tag]) as $priority ) { if ( isset($wp_filter[$tag][$priority][$idx]) ) return $priority; } Index: post-template.php =================================================================== --- post-template.php (revision 8483) +++ post-template.php (working copy) @@ -252,7 +252,7 @@ function the_meta() { if ( $keys = get_post_custom_keys() ) { echo "