Changeset 12513

Timestamp:

12/23/2009 03:16:53 PM (14 years ago)

Author:

ryan

Message:

Remove unneeded quotes around vars. Props johnbillion. fixes #10245

Location:

trunk

Files:

• wp-admin/admin-header.php (modified) (1 diff)
• wp-admin/import/dotclear.php (modified) (1 diff)
• wp-admin/import/greymatter.php (modified) (3 diffs)
• wp-admin/import/mt.php (modified) (2 diffs)
• wp-admin/import/wordpress.php (modified) (1 diff)
• wp-admin/includes/misc.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (3 diffs)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-admin/theme-editor.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (3 diffs)
• wp-includes/link-template.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (1 diff)

trunk/wp-admin/admin-header.php

@@ -30 +30 @@
 $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);

trunk/wp-admin/import/dotclear.php

@@ -408 +408 @@
                 $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);

trunk/wp-admin/import/greymatter.php

@@ -87 +87 @@
             $wpvar = $wpvarstoreset[$i];
             if (!isset($$wpvar)) {
-                if (empty($_POST["$wpvar"])) {
-                    if (empty($_GET["$wpvar"])) {
+                if (empty($_POST[$wpvar])) {
+                    if (empty($_GET[$wpvar])) {
                         $$wpvar = '';
                     } else {
-                        $$wpvar = $_GET["$wpvar"];
+                        $$wpvar = $_GET[$wpvar];
                     }
                 } else {
-                    $$wpvar = $_POST["$wpvar"];
+                    $$wpvar = $_POST[$wpvar];
                 }
             }
@@ -140 +140 @@
         }
 
-        $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_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;
@@ -172 +172 @@
         }}}}}}}
 
-        $entryfile .= "$i";
+        $entryfile .= $i;
 
         if (is_file($entryfile.".cgi")) {

trunk/wp-admin/import/mt.php

@@ -156 +156 @@
             $next = array_shift($temp);
             if (!(in_array($next, $authors)))
-                array_push($authors, "$next");
+                array_push($authors, $next);
         }
 
@@ -172 +172 @@
             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);
         }
 

trunk/wp-admin/import/wordpress.php

@@ -164 +164 @@
             $next = array_shift($temp);
             if (!(in_array($next, $authors)))
-                array_push($authors, "$next");
+                array_push($authors, $next);
         }
 

trunk/wp-admin/includes/misc.php

@@ -240 +240 @@
 
         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];
             }
         }

trunk/wp-admin/includes/post.php

@@ -1407 +1407 @@
         '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',
@@ -1433 +1433 @@
         'paste_strip_class_attributes' => 'all',
         'wpeditimage_disable_captions' => $no_captions,
-        'plugins' => "$plugins"
+        'plugins' => $plugins
     );
 
@@ -1439 +1439 @@
 
     if ( ! empty($mce_css) )
-        $initArray['content_css'] = "$mce_css";
+        $initArray['content_css'] = $mce_css;
 
     if ( is_array($settings) )

trunk/wp-admin/includes/upgrade.php

@@ -1520 +1520 @@
     //$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) {

trunk/wp-admin/theme-editor.php

@@ -156 +156 @@
         $description = trim( get_file_description($template_file) );
         $template_show = basename($template_file);
-        $filedesc = ( $description != $template_file ) ? "$description <span class='nonessential'>($template_show)</span>" : "$description";
+        $filedesc = ( $description != $template_file ) ? "$description <span class='nonessential'>($template_show)</span>" : $description;
         $filedesc = ( $template_file == $file ) ? "<span class='highlight'>$description <span class='nonessential'>($template_show)</span></span>" : $filedesc;
 

trunk/wp-includes/general-template.php

@@ -468 +468 @@
         $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 : "");
     }
 
@@ -474 +474 @@
         $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);
     }
 
@@ -492 +492 @@
         $term = $wp_query->get_queried_object();
         $term = $term->name;
-        $title = "$tax$t_sep$term";
+        $title = $tax . $t_sep . $term;
     }
 

trunk/wp-includes/link-template.php

@@ -226 +226 @@
         $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 {

trunk/wp-includes/post-template.php

@@ -575 +575 @@
             $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)) ) {