Index: wp-admin/admin-header.php =================================================================== --- wp-admin/admin-header.php (revision 11623) +++ wp-admin/admin-header.php (working copy) @@ -29,11 +29,11 @@ $hook_suffix = ''; if ( isset($page_hook) ) - $hook_suffix = "$page_hook"; + $hook_suffix = $page_hook; else if ( isset($plugin_page) ) - $hook_suffix = "$plugin_page"; + $hook_suffix = $plugin_page; else if ( isset($pagenow) ) - $hook_suffix = "$pagenow"; + $hook_suffix = $pagenow; $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix); ?> Index: wp-admin/import/dotclear.php =================================================================== --- wp-admin/import/dotclear.php (revision 11623) +++ wp-admin/import/dotclear.php (working copy) @@ -407,7 +407,7 @@ // WordPressify Data $comment_ID = (int) ltrim($comment_id, '0'); $comment_post_ID = (int) $postarr[$post_id]; - $comment_approved = "$comment_pub"; + $comment_approved = $comment_pub; $name = $wpdb->escape(csc ($comment_auteur)); $email = $wpdb->escape($comment_email); $web = "http://".$wpdb->escape($comment_site); Index: wp-admin/import/greymatter.php =================================================================== --- wp-admin/import/greymatter.php (revision 11623) +++ wp-admin/import/greymatter.php (working copy) @@ -86,14 +86,14 @@ for ($i=0; $i"$user_login", "user_pass"=>"$pass1", "user_nickname"=>"$user_nickname", "user_email"=>"$user_email", "user_url"=>"$user_url", "user_ip"=>"$user_ip", "user_domain"=>"$user_domain", "user_browser"=>"$user_browser", "dateYMDhour"=>"$user_joindate", "user_level"=>"1", "user_idmode"=>"nickname"); + $user_info = array("user_login"=>$user_login, "user_pass"=>$pass1, "user_nickname"=>$user_nickname, "user_email"=>$user_email, "user_url"=>$user_url, "user_ip"=>$user_ip, "user_domain"=>$user_domain, "user_browser"=>$user_browser, "dateYMDhour"=>$user_joindate, "user_level"=>"1", "user_idmode"=>"nickname"); $user_id = wp_insert_user($user_info); $this->gmnames[$userdata[0]] = $user_id; @@ -171,7 +171,7 @@ $entryfile .= "0"; }}}}}}} - $entryfile .= "$i"; + $entryfile .= $i; if (is_file($entryfile.".cgi")) { Index: wp-admin/import/mt.php =================================================================== --- wp-admin/import/mt.php (revision 11623) +++ wp-admin/import/mt.php (working copy) @@ -155,7 +155,7 @@ for ($x = 1; $x < $y; $x ++) { $next = array_shift($temp); if (!(in_array($next, $authors))) - array_push($authors, "$next"); + array_push($authors, $next); } $this->fclose($handle); @@ -171,12 +171,12 @@ $newname = trim(stripslashes($line)); if ($newname == '') $newname = 'left_blank'; //passing author names from step 1 to step 2 is accomplished by using POST. left_blank denotes an empty entry in the form. - array_push($formnames, "$newname"); + array_push($formnames, $newname); } // $formnames is the array with the form entered names foreach ($_POST['userselect'] as $user => $key) { $selected = trim(stripslashes($key)); - array_push($selectnames, "$selected"); + array_push($selectnames, $selected); } $count = count($formnames); Index: wp-admin/import/wordpress.php =================================================================== --- wp-admin/import/wordpress.php (revision 11623) +++ wp-admin/import/wordpress.php (working copy) @@ -153,7 +153,7 @@ for ($x = 1; $x < $y; $x ++) { $next = array_shift($temp); if (!(in_array($next, $authors))) - array_push($authors, "$next"); + array_push($authors, $next); } return $authors; Index: wp-admin/includes/misc.php =================================================================== --- wp-admin/includes/misc.php (revision 11623) +++ wp-admin/includes/misc.php (working copy) @@ -239,13 +239,13 @@ global $$var; if (!isset( $$var ) ) { - if ( empty( $_POST["$var"] ) ) { - if ( empty( $_GET["$var"] ) ) + if ( empty( $_POST[$var] ) ) { + if ( empty( $_GET[$var] ) ) $$var = ''; else - $$var = $_GET["$var"]; + $$var = $_GET[$var]; } else { - $$var = $_POST["$var"]; + $$var = $_POST[$var]; } } } Index: wp-admin/includes/post.php =================================================================== --- wp-admin/includes/post.php (revision 11623) +++ wp-admin/includes/post.php (working copy) @@ -1293,12 +1293,12 @@ 'width' => '100%', 'theme' => 'advanced', 'skin' => 'wp_theme', - 'theme_advanced_buttons1' => "$mce_buttons", - 'theme_advanced_buttons2' => "$mce_buttons_2", - 'theme_advanced_buttons3' => "$mce_buttons_3", - 'theme_advanced_buttons4' => "$mce_buttons_4", - 'language' => "$mce_locale", - 'spellchecker_languages' => "$mce_spellchecker_languages", + 'theme_advanced_buttons1' => $mce_buttons, + 'theme_advanced_buttons2' => $mce_buttons_2, + 'theme_advanced_buttons3' => $mce_buttons_3, + 'theme_advanced_buttons4' => $mce_buttons_4, + 'language' => $mce_locale, + 'spellchecker_languages' => $mce_spellchecker_languages, 'theme_advanced_toolbar_location' => 'top', 'theme_advanced_toolbar_align' => 'left', 'theme_advanced_statusbar_location' => 'bottom', @@ -1317,13 +1317,13 @@ 'media_strict' => false, 'save_callback' => 'switchEditors.saveCallback', 'wpeditimage_disable_captions' => $no_captions, - 'plugins' => "$plugins" + 'plugins' => $plugins ); $mce_css = trim(apply_filters('mce_css', ''), ' ,'); if ( ! empty($mce_css) ) - $initArray['content_css'] = "$mce_css"; + $initArray['content_css'] = $mce_css; // For people who really REALLY know what they're doing with TinyMCE // You can modify initArray to add, remove, change elements of the config before tinyMCE.init Index: wp-admin/includes/upgrade.php =================================================================== --- wp-admin/includes/upgrade.php (revision 11623) +++ wp-admin/includes/upgrade.php (working copy) @@ -1496,7 +1496,7 @@ // Copy files from the default theme to the site theme. //$files = array('index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css'); - $theme_dir = @ opendir("$default_dir"); + $theme_dir = @ opendir($default_dir); if ($theme_dir) { while(($theme_file = readdir( $theme_dir )) !== false) { if (is_dir("$default_dir/$theme_file")) Index: wp-admin/theme-editor.php =================================================================== --- wp-admin/theme-editor.php (revision 11623) +++ wp-admin/theme-editor.php (working copy) @@ -155,7 +155,7 @@ foreach ( $themes[$theme]['Template Files'] as $template_file ) { $description = trim( get_file_description($template_file) ); $template_show = basename($template_file); - $filedesc = ( $description != $template_file ) ? "$description ($template_show)" : "$description"; + $filedesc = ( $description != $template_file ) ? "$description ($template_show)" : $description; $filedesc = ( $template_file == $file ) ? "$description ($template_show)" : $filedesc; // If we have two files of the same name prefer the one in the Template Directory @@ -171,7 +171,7 @@ ksort( $template_mapping ); while ( list( $template_sorted_key, list( $template_file, $filedesc ) ) = each( $template_mapping ) ) : ?> -
  • &theme=">
    • +

    • @@ -181,14 +181,14 @@ foreach ( $themes[$theme]['Stylesheet Files'] as $style_file ) { $description = trim( get_file_description($style_file) ); $style_show = basename($style_file); - $filedesc = ( $description != $style_file ) ? "$description ($style_show)" : "$description"; + $filedesc = ( $description != $style_file ) ? "$description ($style_show)" : $description; $filedesc = ( $style_file == $file ) ? "$description ($style_show)" : $filedesc; $template_mapping[ $description ] = array( $style_file, $filedesc ); } ksort( $template_mapping ); while ( list( $template_sorted_key, list( $style_file, $filedesc ) ) = each( $template_mapping ) ) : ?> -
  • &theme=">
    • +
    • Index: wp-includes/class-pop3.php =================================================================== --- wp-includes/class-pop3.php (revision 11623) +++ wp-includes/class-pop3.php (working copy) @@ -85,7 +85,7 @@ return false; } - $fp = @fsockopen("$server", $port, $errno, $errstr); + $fp = @fsockopen($server, $port, $errno, $errstr); if(!$fp) { $this->ERROR = "POP3 connect: " . _("Error ") . "[$errno] [$errstr]"; Index: wp-includes/class-snoopy.php =================================================================== --- wp-includes/class-snoopy.php (revision 11623) +++ wp-includes/class-snoopy.php (working copy) @@ -1017,7 +1017,7 @@ $results = implode("\r\n",$results); - $result_headers = file("$headerfile"); + $result_headers = file($headerfile); $this->_redirectaddr = false; unset($this->headers); @@ -1072,7 +1072,7 @@ else $this->results = $results; - unlink("$headerfile"); + unlink($headerfile); return true; } Index: wp-includes/general-template.php =================================================================== --- wp-includes/general-template.php (revision 11623) +++ wp-includes/general-template.php (working copy) @@ -467,15 +467,15 @@ $my_year = substr($m, 0, 4); $my_month = $wp_locale->get_month(substr($m, 4, 2)); $my_day = intval(substr($m, 6, 2)); - $title = "$my_year" . ($my_month ? "$t_sep$my_month" : "") . ($my_day ? "$t_sep$my_day" : ""); + $title = $my_year . ($my_month ? $t_sep . $my_month : "") . ($my_day ? $t_sep . $my_day : ""); } if ( !empty($year) ) { $title = $year; if ( !empty($monthnum) ) - $title .= "$t_sep" . $wp_locale->get_month($monthnum); + $title .= $t_sep . $wp_locale->get_month($monthnum); if ( !empty($day) ) - $title .= "$t_sep" . zeroise($day, 2); + $title .= $t_sep . zeroise($day, 2); } // If there is a post @@ -491,7 +491,7 @@ $tax = $tax->label; $term = $wp_query->get_queried_object(); $term = $term->name; - $title = "$tax$t_sep$term"; + $title = $tax . $t_sep . $term; } //If it's a search Index: wp-includes/link-template.php =================================================================== --- wp-includes/link-template.php (revision 11623) +++ wp-includes/link-template.php (working copy) @@ -225,7 +225,7 @@ if ( '' != $pagestruct && ( ( isset($post->post_status) && 'draft' != $post->post_status ) || $sample ) ) { $link = get_page_uri($id); $link = ( $leavename ) ? $pagestruct : str_replace('%pagename%', $link, $pagestruct); - $link = trailingslashit(get_option('home')) . "$link"; + $link = trailingslashit(get_option('home')) . $link; $link = user_trailingslashit($link, 'page'); } else { $link = trailingslashit(get_option('home')) . "?page_id=$id"; Index: wp-includes/pomo/po.php =================================================================== --- wp-includes/pomo/po.php (revision 11623) +++ wp-includes/pomo/po.php (working copy) @@ -90,9 +90,9 @@ $tab = "\t"; $replaces = array( - "$slash" => "$slash$slash", - "$tab" => '\t', - "$quote" => "$slash$quote", + $slash => $slash . $slash, + $tab => '\t', + $quote => $slash . $quote, ); $string = str_replace(array_keys($replaces), array_values($replaces), $string); Index: wp-includes/post-template.php =================================================================== --- wp-includes/post-template.php (revision 11623) +++ wp-includes/post-template.php (working copy) @@ -581,7 +581,7 @@ if ( 'number' == $next_or_number ) { $output .= $before; for ( $i = 1; $i < ($numpages+1); $i = $i + 1 ) { - $j = str_replace('%',"$i",$pagelink); + $j = str_replace('%',$i,$pagelink); $output .= ' '; if ( ($i != $page) || ((!$more) && ($page==1)) ) { if ( 1 == $i ) {