WordPress.org

Make WordPress Core

Changeset 12513


Ignore:
Timestamp:
12/23/2009 03:16:53 PM (8 years ago)
Author:
ryan
Message:

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

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/admin-header.php

    r12015 r12513  
    3030$hook_suffix = '';
    3131if ( isset($page_hook) )
    32     $hook_suffix = "$page_hook";
     32    $hook_suffix = $page_hook;
    3333else if ( isset($plugin_page) )
    34     $hook_suffix = "$plugin_page";
     34    $hook_suffix = $plugin_page;
    3535else if ( isset($pagenow) )
    36     $hook_suffix = "$pagenow";
     36    $hook_suffix = $pagenow;
    3737
    3838$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
  • trunk/wp-admin/import/dotclear.php

    r12270 r12513  
    408408                $comment_ID = (int) ltrim($comment_id, '0');
    409409                $comment_post_ID = (int) $postarr[$post_id];
    410                 $comment_approved = "$comment_pub";
     410                $comment_approved = $comment_pub;
    411411                $name = $wpdb->escape(csc ($comment_auteur));
    412412                $email = $wpdb->escape($comment_email);
  • trunk/wp-admin/import/greymatter.php

    r12100 r12513  
    8787            $wpvar = $wpvarstoreset[$i];
    8888            if (!isset($$wpvar)) {
    89                 if (empty($_POST["$wpvar"])) {
    90                     if (empty($_GET["$wpvar"])) {
     89                if (empty($_POST[$wpvar])) {
     90                    if (empty($_GET[$wpvar])) {
    9191                        $$wpvar = '';
    9292                    } else {
    93                         $$wpvar = $_GET["$wpvar"];
     93                        $$wpvar = $_GET[$wpvar];
    9494                    }
    9595                } else {
    96                     $$wpvar = $_POST["$wpvar"];
     96                    $$wpvar = $_POST[$wpvar];
    9797                }
    9898            }
     
    140140        }
    141141
    142         $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");
     142        $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");
    143143        $user_id = wp_insert_user($user_info);
    144144        $this->gmnames[$userdata[0]] = $user_id;
     
    172172        }}}}}}}
    173173
    174         $entryfile .= "$i";
     174        $entryfile .= $i;
    175175
    176176        if (is_file($entryfile.".cgi")) {
  • trunk/wp-admin/import/mt.php

    r11882 r12513  
    156156            $next = array_shift($temp);
    157157            if (!(in_array($next, $authors)))
    158                 array_push($authors, "$next");
     158                array_push($authors, $next);
    159159        }
    160160
     
    172172            if ($newname == '')
    173173                $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.
    174             array_push($formnames, "$newname");
     174            array_push($formnames, $newname);
    175175        } // $formnames is the array with the form entered names
    176176
    177177        foreach ($_POST['userselect'] as $user => $key) {
    178178            $selected = trim(stripslashes($key));
    179             array_push($selectnames, "$selected");
     179            array_push($selectnames, $selected);
    180180        }
    181181
  • trunk/wp-admin/import/wordpress.php

    r12495 r12513  
    164164            $next = array_shift($temp);
    165165            if (!(in_array($next, $authors)))
    166                 array_push($authors, "$next");
     166                array_push($authors, $next);
    167167        }
    168168
  • trunk/wp-admin/includes/misc.php

    r12264 r12513  
    240240
    241241        if (!isset( $$var ) ) {
    242             if ( empty( $_POST["$var"] ) ) {
    243                 if ( empty( $_GET["$var"] ) )
     242            if ( empty( $_POST[$var] ) ) {
     243                if ( empty( $_GET[$var] ) )
    244244                    $$var = '';
    245245                else
    246                     $$var = $_GET["$var"];
     246                    $$var = $_GET[$var];
    247247            } else {
    248                 $$var = $_POST["$var"];
     248                $$var = $_POST[$var];
    249249            }
    250250        }
  • trunk/wp-admin/includes/post.php

    r12483 r12513  
    14071407        'theme' => 'advanced',
    14081408        'skin' => 'wp_theme',
    1409         'theme_advanced_buttons1' => "$mce_buttons",
    1410         'theme_advanced_buttons2' => "$mce_buttons_2",
    1411         'theme_advanced_buttons3' => "$mce_buttons_3",
    1412         'theme_advanced_buttons4' => "$mce_buttons_4",
    1413         'language' => "$mce_locale",
    1414         'spellchecker_languages' => "$mce_spellchecker_languages",
     1409        'theme_advanced_buttons1' => $mce_buttons,
     1410        'theme_advanced_buttons2' => $mce_buttons_2,
     1411        'theme_advanced_buttons3' => $mce_buttons_3,
     1412        'theme_advanced_buttons4' => $mce_buttons_4,
     1413        'language' => $mce_locale,
     1414        'spellchecker_languages' => $mce_spellchecker_languages,
    14151415        'theme_advanced_toolbar_location' => 'top',
    14161416        'theme_advanced_toolbar_align' => 'left',
     
    14331433        'paste_strip_class_attributes' => 'all',
    14341434        'wpeditimage_disable_captions' => $no_captions,
    1435         'plugins' => "$plugins"
     1435        'plugins' => $plugins
    14361436    );
    14371437
     
    14391439
    14401440    if ( ! empty($mce_css) )
    1441         $initArray['content_css'] = "$mce_css";
     1441        $initArray['content_css'] = $mce_css;
    14421442
    14431443    if ( is_array($settings) )
  • trunk/wp-admin/includes/upgrade.php

    r12366 r12513  
    15201520    //$files = array('index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css');
    15211521
    1522     $theme_dir = @ opendir("$default_dir");
     1522    $theme_dir = @ opendir($default_dir);
    15231523    if ($theme_dir) {
    15241524        while(($theme_file = readdir( $theme_dir )) !== false) {
  • trunk/wp-admin/theme-editor.php

    r12310 r12513  
    156156        $description = trim( get_file_description($template_file) );
    157157        $template_show = basename($template_file);
    158         $filedesc = ( $description != $template_file ) ? "$description <span class='nonessential'>($template_show)</span>" : "$description";
     158        $filedesc = ( $description != $template_file ) ? "$description <span class='nonessential'>($template_show)</span>" : $description;
    159159        $filedesc = ( $template_file == $file ) ? "<span class='highlight'>$description <span class='nonessential'>($template_show)</span></span>" : $filedesc;
    160160
  • trunk/wp-includes/general-template.php

    r12356 r12513  
    468468        $my_month = $wp_locale->get_month(substr($m, 4, 2));
    469469        $my_day = intval(substr($m, 6, 2));
    470         $title = "$my_year" . ($my_month ? "$t_sep$my_month" : "") . ($my_day ? "$t_sep$my_day" : "");
     470        $title = $my_year . ($my_month ? $t_sep . $my_month : "") . ($my_day ? $t_sep . $my_day : "");
    471471    }
    472472
     
    474474        $title = $year;
    475475        if ( !empty($monthnum) )
    476             $title .= "$t_sep" . $wp_locale->get_month($monthnum);
     476            $title .= $t_sep . $wp_locale->get_month($monthnum);
    477477        if ( !empty($day) )
    478             $title .= "$t_sep" . zeroise($day, 2);
     478            $title .= $t_sep . zeroise($day, 2);
    479479    }
    480480
     
    492492        $term = $wp_query->get_queried_object();
    493493        $term = $term->name;
    494         $title = "$tax$t_sep$term";
     494        $title = $tax . $t_sep . $term;
    495495    }
    496496
  • trunk/wp-includes/link-template.php

    r12457 r12513  
    226226        $link = get_page_uri($id);
    227227        $link = ( $leavename ) ? $pagestruct : str_replace('%pagename%', $link, $pagestruct);
    228         $link = trailingslashit(get_option('home')) . "$link";
     228        $link = trailingslashit(get_option('home')) . $link;
    229229        $link = user_trailingslashit($link, 'page');
    230230    } else {
  • trunk/wp-includes/post-template.php

    r12500 r12513  
    575575            $output .= $before;
    576576            for ( $i = 1; $i < ($numpages+1); $i = $i + 1 ) {
    577                 $j = str_replace('%',"$i",$pagelink);
     577                $j = str_replace('%',$i,$pagelink);
    578578                $output .= ' ';
    579579                if ( ($i != $page) || ((!$more) && ($page==1)) ) {
Note: See TracChangeset for help on using the changeset viewer.