Make WordPress Core

Changeset 5708


Ignore:
Timestamp:
06/14/2007 10:45:40 PM (17 years ago)
Author:
ryan
Message:

Use EXTR_SKIP when extracting. see #4468

Location:
trunk
Files:
15 edited

Legend:

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

    r5631 r5708  
    8383<?php
    8484    $result = wp_install($weblog_title, 'admin', $admin_email, $public);
    85     extract($result);
     85    extract($result, EXTR_SKIP);
    8686?>
    8787
  • trunk/wp-includes/author-template.php

    r5701 r5708  
    371371
    372372    $r = wp_parse_args( $args, $defaults );
    373     extract($r);
     373    extract($r, EXTR_SKIP);
    374374
    375375    $return = '';
  • trunk/wp-includes/bookmark-template.php

    r5700 r5708  
    2626
    2727    $r = wp_parse_args( $args, $defaults );
    28     extract( $r );
     28    extract( $r, EXTR_SKIP );
    2929
    3030    return get_links($category, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated, $echo);
     
    248248
    249249    $r = wp_parse_args( $args, $defaults );
    250     extract( $r );
     250    extract( $r, EXTR_SKIP );
    251251
    252252    foreach ( (array) $bookmarks as $bookmark ) {
     
    328328
    329329    $r = wp_parse_args( $args, $defaults );
    330     extract( $r );
     330    extract( $r, EXTR_SKIP );
    331331
    332332    $output = '';
  • trunk/wp-includes/bookmark.php

    r5700 r5708  
    3636
    3737    $r = wp_parse_args( $args, $defaults );
    38     extract( $r );
     38    extract( $r, EXTR_SKIP );
    3939
    4040    $key = md5( serialize( $r ) );
  • trunk/wp-includes/classes.php

    r5700 r5708  
    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 );
     
    695695
    696696        $r = wp_parse_args( $args, $defaults );
    697         extract( $r );
     697        extract( $r, EXTR_SKIP );
    698698
    699699        if ( is_wp_error($id) ) {
  • trunk/wp-includes/comment-template.php

    r5666 r5708  
    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.
  • trunk/wp-includes/comment.php

    r5666 r5708  
    182182function wp_allow_comment($commentdata) {
    183183    global $wpdb;
    184     extract($commentdata);
     184    extract($commentdata, EXTR_SKIP);
    185185
    186186    // Simple duplicate check
     
    335335function wp_insert_comment($commentdata) {
    336336    global $wpdb;
    337     extract($commentdata);
     337    extract($commentdata, EXTR_SKIP);
    338338
    339339    if ( ! isset($comment_author_IP) )
     
    470470
    471471    // Now extract the merged array.
    472     extract($commentarr);
     472    extract($commentarr, EXTR_SKIP);
    473473
    474474    $comment_content = apply_filters('comment_save_pre', $comment_content);
     
    532532    $pingback_href_original_pos = 27;
    533533
    534     extract(parse_url($url));
     534    extract(parse_url($url), EXTR_SKIP);
    535535
    536536    if ( !isset($host) ) // Not an URL. This should never happen.
  • trunk/wp-includes/general-template.php

    r5700 r5708  
    331331
    332332    $r = wp_parse_args( $args, $defaults );
    333     extract( $r );
     333    extract( $r, EXTR_SKIP );
    334334
    335335    if ( '' == $type )
  • trunk/wp-includes/pluggable.php

    r5700 r5708  
    169169
    170170    // Compact the input, apply the filters, and extract them back out
    171     extract( apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers' ) ) );
     171    extract( apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers' ) ), EXTR_SKIP );
    172172
    173173    // Default headers
  • trunk/wp-includes/post-template.php

    r5707 r5708  
    144144
    145145    $r = wp_parse_args( $args, $defaults );
    146     extract( $r );
     146    extract( $r, EXTR_SKIP );
    147147
    148148    global $post, $id, $page, $numpages, $multipage, $more, $pagenow;
     
    257257
    258258    $r = wp_parse_args( $args, $defaults );
    259     extract( $r );
     259    extract( $r, EXTR_SKIP );
    260260
    261261    $pages = get_pages($r);
     
    288288
    289289    $r = wp_parse_args( $args, $defaults );
    290     extract( $r );
     290    extract( $r, EXTR_SKIP );
    291291
    292292    $output = '';
  • trunk/wp-includes/post.php

    r5707 r5708  
    186186
    187187    $r = wp_parse_args( $args, $defaults );
    188     extract( $r );
     188    extract( $r, EXTR_SKIP );
    189189
    190190    $numberposts = (int) $numberposts;
     
    496496
    497497    // export array as variables
    498     extract($postarr);
     498    extract($postarr, EXTR_SKIP);
    499499
    500500    // Are we updating or creating?
     
    864864
    865865        // import postdata as variables
    866         extract($postdata);
     866        extract($postdata, EXTR_SKIP);
    867867
    868868        // form an excerpt
     
    10511051
    10521052    $r = wp_parse_args( $args, $defaults );
    1053     extract( $r );
     1053    extract( $r, EXTR_SKIP );
    10541054
    10551055    $key = md5( serialize( $r ) );
     
    12051205
    12061206    // Export array as variables
    1207     extract($object);
     1207    extract($object, EXTR_SKIP);
    12081208
    12091209    // Get the basics.
  • trunk/wp-includes/registration.php

    r5627 r5708  
    4646    global $wpdb;
    4747
    48     extract($userdata);
     48    extract($userdata, EXTR_SKIP);
    4949
    5050    // Are we updating or creating?
  • trunk/wp-includes/taxonomy.php

    r5700 r5708  
    4545    $defaults = array('ignore_empty' => false);
    4646    $args = wp_parse_args($args, $defaults);
    47     extract($args);
     47    extract($args, EXTR_SKIP);
    4848
    4949    $where = '';
     
    7070    $args['name'] = $term;
    7171    $args = sanitize_term($args, $taxonomy, 'db');
    72     extract($args);
     72    extract($args, EXTR_SKIP);
    7373
    7474    if ( empty($slug) )
     
    154154    $defaults = array();
    155155    $args = wp_parse_args($args, $defaults);
    156     extract($args);
     156    extract($args, EXTR_SKIP);
    157157
    158158    if ( isset($default) ) {
     
    215215    $defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
    216216    $args = wp_parse_args($args, $defaults);
    217     extract($args);
     217    extract($args, EXTR_SKIP);
    218218
    219219    if ( empty($slug) )
     
    383383    $defaults = array('order' => 'ASC');
    384384    $args = wp_parse_args( $args, $defaults );
    385     extract($args);
     385    extract($args, EXTR_SKIP);
    386386
    387387    $terms = array_map('intval', $terms);
     
    428428    $defaults = array('orderby' => 'name', 'order' => 'ASC', 'fields' => 'all');
    429429    $args = wp_parse_args( $args, $defaults );
    430     extract($args);
     430    extract($args, EXTR_SKIP);
    431431
    432432    if ( 'count' == $orderby )
     
    490490        $args['hierarchical'] = false;
    491491    }
    492     extract($args);
     492    extract($args, EXTR_SKIP);
    493493
    494494    if ( $child_of ) {
  • trunk/wp-includes/user.php

    r5700 r5708  
    193193
    194194    $r = wp_parse_args( $args, $defaults );
    195     extract( $r );
     195    extract( $r, EXTR_SKIP );
    196196
    197197    $query = "SELECT * FROM $wpdb->users";
  • trunk/wp-includes/widgets.php

    r5700 r5708  
    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.
Note: See TracChangeset for help on using the changeset viewer.