WordPress.org
Get WordPress

Make WordPress Core

Changeset 5714


Ignore:
Timestamp:
06/15/2007 05:45:21 PM (18 years ago)
Author:
ryan
Message:

Use EXTR_SKIP when extracting. For 2.2. See #4468

Location:
branches/2.2
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • branches/2.2/wp-admin/admin-db.php

    r5289 r5714  
    8383    global $wpdb;
    8484
    85     extract($catarr);
     85    extract($catarr, EXTR_SKIP);
    8686
    8787    if( trim( $cat_name ) == '' )
    … …  
    298298    global $wpdb, $current_user;
    299299
    300     extract($linkdata);
     300    extract($linkdata, EXTR_SKIP);
    301301
    302302    $update = false;

  • branches/2.2/wp-admin/install.php

    r4766 r5714  
    8383<?php
    8484    $result = wp_install($weblog_title, 'admin', $admin_email, $public);
    85     extract($result);
     85    extract($result, EXTR_SKIP);
    8686?>
    8787

  • branches/2.2/wp-includes/author-template.php

    r5135 r5714  
    184184        'feed' => '', 'feed_image' => '');
    185185    $r = array_merge($defaults, $r);
    186     extract($r);
     186    extract($r, EXTR_SKIP);
    187187   
    188188    // TODO:  Move select to get_authors().

  • branches/2.2/wp-includes/bookmark-template.php

    r5153 r5714  
    254254        'after' => '</li>', 'between' => "\n");
    255255    $r = array_merge($defaults, $r);
    256     extract($r);
     256    extract($r, EXTR_SKIP);
    257257
    258258    foreach ( (array) $bookmarks as $bookmark ) {
    … …  
    332332        'category_before' => '<li id="%id" class="%class">', 'category_after' => '</li>');
    333333    $r = array_merge($defaults, $r);
    334     extract($r);
     334    extract($r, EXTR_SKIP);
    335335
    336336    $output = '';

  • branches/2.2/wp-includes/bookmark.php

    r5248 r5714  
    3535        'category_name' => '', 'hide_invisible' => 1, 'show_updated' => 0, 'include' => '', 'exclude' => '');
    3636    $r = array_merge($defaults, $r);
    37     extract($r);
     37    extract($r, EXTR_SKIP);
    3838
    3939    $key = md5( serialize( $r ) );

  • branches/2.2/wp-includes/category-template.php

    r5591 r5714  
    192192    $r = array_merge($defaults, $r);
    193193    $r['include_last_update_time'] = $r['show_last_update'];
    194     extract($r);
     194    extract($r, EXTR_SKIP);
    195195
    196196    $categories = get_categories($r);
    … …  
    243243    if ( isset($r['show_date']) )
    244244        $r['include_last_update_time'] = $r['show_date'];
    245     extract($r);
     245    extract($r, EXTR_SKIP);
    246246
    247247    $categories = get_categories($r);

  • branches/2.2/wp-includes/category.php

    r5296 r5714  
    2929        $r['orderby'] = "cat_" . $r['orderby'];  // restricts order by to cat_ID and cat_name fields
    3030    $r['number'] = (int) $r['number'];
    31     extract($r);
     31    extract($r, EXTR_SKIP);
    3232
    3333    $key = md5( serialize( $r ) );

  • branches/2.2/wp-includes/classes.php

    r5289 r5714  
    507507        if ( $depth )
    508508            $indent = str_repeat("\t", $depth);
    509         extract($args);
     509        extract($args, EXTR_SKIP);
    510510        $css_class = 'page_item';
    511511        $_current_page = get_page( $current_page );
    … …  
    697697
    698698        $r = array_merge($defaults, $r);
    699         extract($r);
     699        extract($r, EXTR_SKIP);
    700700
    701701        if ( is_wp_error($id) ) {

  • branches/2.2/wp-includes/comment-template.php

    r5626 r5714  
    286286    $req = get_option('require_name_email');
    287287    $commenter = wp_get_current_commenter();
    288     extract($commenter);
     288    extract($commenter, EXTR_SKIP);
    289289
    290290    // TODO: Use API instead of SELECTs.

  • branches/2.2/wp-includes/comment.php

    r5119 r5714  
    179179function wp_allow_comment($commentdata) {
    180180    global $wpdb;
    181     extract($commentdata);
     181    extract($commentdata, EXTR_SKIP);
    182182
    183183    // Simple duplicate check
    … …  
    326326function wp_insert_comment($commentdata) {
    327327    global $wpdb;
    328     extract($commentdata);
     328    extract($commentdata, EXTR_SKIP);
    329329
    330330    if ( ! isset($comment_author_IP) )
    … …  
    458458
    459459    // Now extract the merged array.
    460     extract($commentarr);
     460    extract($commentarr, EXTR_SKIP);
    461461
    462462    $comment_content = apply_filters('comment_save_pre', $comment_content);
    … …  
    518518    $pingback_href_original_pos = 27;
    519519
    520     extract(parse_url($url));
     520    extract(parse_url($url), EXTR_SKIP);
    521521
    522522    if ( !isset($host) ) // Not an URL. This should never happen.

  • branches/2.2/wp-includes/general-template.php

    r5713 r5714  
    323323    $defaults = array('type' => 'monthly', 'limit' => '', 'format' => 'html', 'before' => '', 'after' => '', 'show_post_count' => false);
    324324    $r = array_merge($defaults, $r);
    325     extract($r);
     325    extract($r, EXTR_SKIP);
    326326
    327327    if ( '' == $type )

  • branches/2.2/wp-includes/pluggable.php

    r5695 r5714  
    169169    $mail = compact('to', 'subject', 'message', 'headers');
    170170    $mail = apply_filters('wp_mail', $mail);
    171     extract($mail);
     171    extract($mail, EXTR_SKIP);
    172172
    173173    if ( $headers == '' ) {

  • branches/2.2/wp-includes/post-template.php

    r5244 r5714  
    142142            'previouspagelink' => __('Previous page'), 'pagelink' => '%', 'more_file' => '', 'echo' => 1);
    143143    $r = array_merge($defaults, $r);
    144     extract($r);
     144    extract($r, EXTR_SKIP);
    145145
    146146    global $id, $page, $numpages, $multipage, $more, $pagenow;
    … …  
    256256        'name' => 'page_id', 'show_option_none' => '');
    257257    $r = array_merge($defaults, $r);
    258     extract($r);
     258    extract($r, EXTR_SKIP);
    259259
    260260    $pages = get_pages($r);

  • branches/2.2/wp-includes/post.php

    r5459 r5714  
    183183        'meta_key' => '', 'meta_value' =>'', 'post_type' => 'post', 'post_status' => 'publish', 'post_parent' => 0);
    184184    $r = array_merge($defaults, $r);
    185     extract($r);
     185    extract($r, EXTR_SKIP);
    186186    $numberposts = (int) $numberposts;
    187187    $offset = (int) $offset;
    … …  
    491491
    492492    // export array as variables
    493     extract($postarr);
     493    extract($postarr, EXTR_SKIP);
    494494
    495495    // Are we updating or creating?
    … …  
    882882
    883883        // import postdata as variables
    884         extract($postdata);
     884        extract($postdata, EXTR_SKIP);
    885885
    886886        // form an excerpt
    … …  
    10681068                'hierarchical' => 1, 'exclude' => '', 'include' => '', 'meta_key' => '', 'meta_value' => '', 'authors' => '');
    10691069    $r = array_merge($defaults, $r);
    1070     extract($r);
     1070    extract($r, EXTR_SKIP);
    10711071
    10721072    $key = md5( serialize( $r ) );
    … …  
    12221222
    12231223    // Export array as variables
    1224     extract($object);
     1224    extract($object, EXTR_SKIP);
    12251225
    12261226    // Get the basics.

  • branches/2.2/wp-includes/registration.php

    r5087 r5714  
    3333    global $wpdb;
    3434
    35     extract($userdata);
     35    extract($userdata, EXTR_SKIP);
    3636
    3737    // Are we updating or creating?

  • branches/2.2/wp-includes/widgets.php

    r5688 r5714  
    390390function wp_widget_links($args) {
    391391    global $wp_db_version;
    392     extract($args);
     392    extract($args, EXTR_SKIP);
    393393    if ( $wp_db_version < 3582 ) {
    394394        // This ONLY works with li/h2 sidebars.
    … …  
    806806function wp_widget_rss($args, $number = 1) {
    807807    require_once(ABSPATH . WPINC . '/rss.php');
    808     extract($args);
     808    extract($args, EXTR_SKIP);
    809809    $options = get_option('widget_rss');
    810810    if ( isset($options['error']) && $options['error'] )
Note: See TracChangeset for help on using the changeset viewer.