<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12513] trunk: Remove unneeded quotes around vars.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12513">12513</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-12-23 15:16:53 +0000 (Wed, 23 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unneeded quotes around vars. Props johnbillion. fixes <a href="http://trac.wordpress.org/ticket/10245">#10245</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminheaderphp">trunk/wp-admin/admin-header.php</a></li>
<li><a href="#trunkwpadminimportdotclearphp">trunk/wp-admin/import/dotclear.php</a></li>
<li><a href="#trunkwpadminimportgreymatterphp">trunk/wp-admin/import/greymatter.php</a></li>
<li><a href="#trunkwpadminimportmtphp">trunk/wp-admin/import/mt.php</a></li>
<li><a href="#trunkwpadminimportwordpressphp">trunk/wp-admin/import/wordpress.php</a></li>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpadminthemeeditorphp">trunk/wp-admin/theme-editor.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-header.php (12512 => 12513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-header.php 2009-12-23 15:02:38 UTC (rev 12512)
+++ trunk/wp-admin/admin-header.php 2009-12-23 15:16:53 UTC (rev 12513)
</span><span class="lines">@@ -29,11 +29,11 @@
</span><span class="cx">
</span><span class="cx"> $hook_suffix = '';
</span><span class="cx"> if ( isset($page_hook) )
</span><del>- $hook_suffix = "$page_hook";
</del><ins>+ $hook_suffix = $page_hook;
</ins><span class="cx"> else if ( isset($plugin_page) )
</span><del>- $hook_suffix = "$plugin_page";
</del><ins>+ $hook_suffix = $plugin_page;
</ins><span class="cx"> else if ( isset($pagenow) )
</span><del>- $hook_suffix = "$pagenow";
</del><ins>+ $hook_suffix = $pagenow;
</ins><span class="cx">
</span><span class="cx"> $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminimportdotclearphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/dotclear.php (12512 => 12513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/dotclear.php 2009-12-23 15:02:38 UTC (rev 12512)
+++ trunk/wp-admin/import/dotclear.php 2009-12-23 15:16:53 UTC (rev 12513)
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx"> // WordPressify Data
</span><span class="cx"> $comment_ID = (int) ltrim($comment_id, '0');
</span><span class="cx"> $comment_post_ID = (int) $postarr[$post_id];
</span><del>- $comment_approved = "$comment_pub";
</del><ins>+ $comment_approved = $comment_pub;
</ins><span class="cx"> $name = $wpdb->escape(csc ($comment_auteur));
</span><span class="cx"> $email = $wpdb->escape($comment_email);
</span><span class="cx"> $web = "http://".$wpdb->escape($comment_site);
</span></span></pre></div>
<a id="trunkwpadminimportgreymatterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/greymatter.php (12512 => 12513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/greymatter.php 2009-12-23 15:02:38 UTC (rev 12512)
+++ trunk/wp-admin/import/greymatter.php 2009-12-23 15:16:53 UTC (rev 12513)
</span><span class="lines">@@ -86,14 +86,14 @@
</span><span class="cx"> for ($i=0; $i<count($wpvarstoreset); $i += 1) {
</span><span class="cx"> $wpvar = $wpvarstoreset[$i];
</span><span class="cx"> if (!isset($$wpvar)) {
</span><del>- if (empty($_POST["$wpvar"])) {
- if (empty($_GET["$wpvar"])) {
</del><ins>+ if (empty($_POST[$wpvar])) {
+ if (empty($_GET[$wpvar])) {
</ins><span class="cx"> $$wpvar = '';
</span><span class="cx"> } else {
</span><del>- $$wpvar = $_GET["$wpvar"];
</del><ins>+ $$wpvar = $_GET[$wpvar];
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- $$wpvar = $_POST["$wpvar"];
</del><ins>+ $$wpvar = $_POST[$wpvar];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $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");
</del><ins>+ $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");
</ins><span class="cx"> $user_id = wp_insert_user($user_info);
</span><span class="cx"> $this->gmnames[$userdata[0]] = $user_id;
</span><span class="cx">
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> $entryfile .= "0";
</span><span class="cx"> }}}}}}}
</span><span class="cx">
</span><del>- $entryfile .= "$i";
</del><ins>+ $entryfile .= $i;
</ins><span class="cx">
</span><span class="cx"> if (is_file($entryfile.".cgi")) {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminimportmtphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/mt.php (12512 => 12513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/mt.php 2009-12-23 15:02:38 UTC (rev 12512)
+++ trunk/wp-admin/import/mt.php 2009-12-23 15:16:53 UTC (rev 12513)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> for ($x = 1; $x < $y; $x ++) {
</span><span class="cx"> $next = array_shift($temp);
</span><span class="cx"> if (!(in_array($next, $authors)))
</span><del>- array_push($authors, "$next");
</del><ins>+ array_push($authors, $next);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $this->fclose($handle);
</span><span class="lines">@@ -171,12 +171,12 @@
</span><span class="cx"> $newname = trim(stripslashes($line));
</span><span class="cx"> if ($newname == '')
</span><span class="cx"> $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.
</span><del>- array_push($formnames, "$newname");
</del><ins>+ array_push($formnames, $newname);
</ins><span class="cx"> } // $formnames is the array with the form entered names
</span><span class="cx">
</span><span class="cx"> foreach ($_POST['userselect'] as $user => $key) {
</span><span class="cx"> $selected = trim(stripslashes($key));
</span><del>- array_push($selectnames, "$selected");
</del><ins>+ array_push($selectnames, $selected);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $count = count($formnames);
</span></span></pre></div>
<a id="trunkwpadminimportwordpressphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/wordpress.php (12512 => 12513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/wordpress.php 2009-12-23 15:02:38 UTC (rev 12512)
+++ trunk/wp-admin/import/wordpress.php 2009-12-23 15:16:53 UTC (rev 12513)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> for ($x = 1; $x < $y; $x ++) {
</span><span class="cx"> $next = array_shift($temp);
</span><span class="cx"> if (!(in_array($next, $authors)))
</span><del>- array_push($authors, "$next");
</del><ins>+ array_push($authors, $next);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $authors;
</span></span></pre></div>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (12512 => 12513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php 2009-12-23 15:02:38 UTC (rev 12512)
+++ trunk/wp-admin/includes/misc.php 2009-12-23 15:16:53 UTC (rev 12513)
</span><span class="lines">@@ -239,13 +239,13 @@
</span><span class="cx"> global $$var;
</span><span class="cx">
</span><span class="cx"> if (!isset( $$var ) ) {
</span><del>- if ( empty( $_POST["$var"] ) ) {
- if ( empty( $_GET["$var"] ) )
</del><ins>+ if ( empty( $_POST[$var] ) ) {
+ if ( empty( $_GET[$var] ) )
</ins><span class="cx"> $$var = '';
</span><span class="cx"> else
</span><del>- $$var = $_GET["$var"];
</del><ins>+ $$var = $_GET[$var];
</ins><span class="cx"> } else {
</span><del>- $$var = $_POST["$var"];
</del><ins>+ $$var = $_POST[$var];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (12512 => 12513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2009-12-23 15:02:38 UTC (rev 12512)
+++ trunk/wp-admin/includes/post.php 2009-12-23 15:16:53 UTC (rev 12513)
</span><span class="lines">@@ -1406,12 +1406,12 @@
</span><span class="cx"> 'width' => '100%',
</span><span class="cx"> 'theme' => 'advanced',
</span><span class="cx"> 'skin' => 'wp_theme',
</span><del>- '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",
</del><ins>+ '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,
</ins><span class="cx"> 'theme_advanced_toolbar_location' => 'top',
</span><span class="cx"> 'theme_advanced_toolbar_align' => 'left',
</span><span class="cx"> 'theme_advanced_statusbar_location' => 'bottom',
</span><span class="lines">@@ -1432,13 +1432,13 @@
</span><span class="cx"> 'paste_remove_spans' => true,
</span><span class="cx"> 'paste_strip_class_attributes' => 'all',
</span><span class="cx"> 'wpeditimage_disable_captions' => $no_captions,
</span><del>- 'plugins' => "$plugins"
</del><ins>+ 'plugins' => $plugins
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $mce_css = trim(apply_filters('mce_css', ''), ' ,');
</span><span class="cx">
</span><span class="cx"> if ( ! empty($mce_css) )
</span><del>- $initArray['content_css'] = "$mce_css";
</del><ins>+ $initArray['content_css'] = $mce_css;
</ins><span class="cx">
</span><span class="cx"> if ( is_array($settings) )
</span><span class="cx"> $initArray = array_merge($initArray, $settings);
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (12512 => 12513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2009-12-23 15:02:38 UTC (rev 12512)
+++ trunk/wp-admin/includes/upgrade.php 2009-12-23 15:16:53 UTC (rev 12513)
</span><span class="lines">@@ -1519,7 +1519,7 @@
</span><span class="cx"> // Copy files from the default theme to the site theme.
</span><span class="cx"> //$files = array('index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css');
</span><span class="cx">
</span><del>- $theme_dir = @ opendir("$default_dir");
</del><ins>+ $theme_dir = @ opendir($default_dir);
</ins><span class="cx"> if ($theme_dir) {
</span><span class="cx"> while(($theme_file = readdir( $theme_dir )) !== false) {
</span><span class="cx"> if (is_dir("$default_dir/$theme_file"))
</span></span></pre></div>
<a id="trunkwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-editor.php (12512 => 12513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-editor.php 2009-12-23 15:02:38 UTC (rev 12512)
+++ trunk/wp-admin/theme-editor.php 2009-12-23 15:16:53 UTC (rev 12513)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> foreach ( $themes[$theme]['Template Files'] as $template_file ) {
</span><span class="cx"> $description = trim( get_file_description($template_file) );
</span><span class="cx"> $template_show = basename($template_file);
</span><del>- $filedesc = ( $description != $template_file ) ? "$description <span class='nonessential'>($template_show)</span>" : "$description";
</del><ins>+ $filedesc = ( $description != $template_file ) ? "$description <span class='nonessential'>($template_show)</span>" : $description;
</ins><span class="cx"> $filedesc = ( $template_file == $file ) ? "<span class='highlight'>$description <span class='nonessential'>($template_show)</span></span>" : $filedesc;
</span><span class="cx">
</span><span class="cx"> // If we have two files of the same name prefer the one in the Template Directory
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (12512 => 12513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2009-12-23 15:02:38 UTC (rev 12512)
+++ trunk/wp-includes/general-template.php 2009-12-23 15:16:53 UTC (rev 12513)
</span><span class="lines">@@ -467,15 +467,15 @@
</span><span class="cx"> $my_year = substr($m, 0, 4);
</span><span class="cx"> $my_month = $wp_locale->get_month(substr($m, 4, 2));
</span><span class="cx"> $my_day = intval(substr($m, 6, 2));
</span><del>- $title = "$my_year" . ($my_month ? "$t_sep$my_month" : "") . ($my_day ? "$t_sep$my_day" : "");
</del><ins>+ $title = $my_year . ($my_month ? $t_sep . $my_month : "") . ($my_day ? $t_sep . $my_day : "");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($year) ) {
</span><span class="cx"> $title = $year;
</span><span class="cx"> if ( !empty($monthnum) )
</span><del>- $title .= "$t_sep" . $wp_locale->get_month($monthnum);
</del><ins>+ $title .= $t_sep . $wp_locale->get_month($monthnum);
</ins><span class="cx"> if ( !empty($day) )
</span><del>- $title .= "$t_sep" . zeroise($day, 2);
</del><ins>+ $title .= $t_sep . zeroise($day, 2);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If there is a post
</span><span class="lines">@@ -491,7 +491,7 @@
</span><span class="cx"> $tax = $tax->label;
</span><span class="cx"> $term = $wp_query->get_queried_object();
</span><span class="cx"> $term = $term->name;
</span><del>- $title = "$tax$t_sep$term";
</del><ins>+ $title = $tax . $t_sep . $term;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //If it's a search
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (12512 => 12513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2009-12-23 15:02:38 UTC (rev 12512)
+++ trunk/wp-includes/link-template.php 2009-12-23 15:16:53 UTC (rev 12513)
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> if ( '' != $pagestruct && ( ( isset($post->post_status) && 'draft' != $post->post_status && 'pending' != $post->post_status ) || $sample ) ) {
</span><span class="cx"> $link = get_page_uri($id);
</span><span class="cx"> $link = ( $leavename ) ? $pagestruct : str_replace('%pagename%', $link, $pagestruct);
</span><del>- $link = trailingslashit(get_option('home')) . "$link";
</del><ins>+ $link = trailingslashit(get_option('home')) . $link;
</ins><span class="cx"> $link = user_trailingslashit($link, 'page');
</span><span class="cx"> } else {
</span><span class="cx"> $link = trailingslashit(get_option('home')) . "?page_id=$id";
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (12512 => 12513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2009-12-23 15:02:38 UTC (rev 12512)
+++ trunk/wp-includes/post-template.php 2009-12-23 15:16:53 UTC (rev 12513)
</span><span class="lines">@@ -574,7 +574,7 @@
</span><span class="cx"> if ( 'number' == $next_or_number ) {
</span><span class="cx"> $output .= $before;
</span><span class="cx"> for ( $i = 1; $i < ($numpages+1); $i = $i + 1 ) {
</span><del>- $j = str_replace('%',"$i",$pagelink);
</del><ins>+ $j = str_replace('%',$i,$pagelink);
</ins><span class="cx"> $output .= ' ';
</span><span class="cx"> if ( ($i != $page) || ((!$more) && ($page==1)) ) {
</span><span class="cx"> if ( 1 == $i ) {
</span></span></pre>
</div>
</div>
</body>
</html>