WordPress.org

Make WordPress Core

Changeset 5709


Ignore:
Timestamp:
06/14/2007 10:46:59 PM (14 years ago)
Author:
ryan
Message:

wp_parse_str() from mdawaffe. see #4467

Location:
trunk/wp-includes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/formatting.php

    r5700 r5709  
    11891189}
    11901190
     1191function wp_parse_str( $string, &$array ) {
     1192    parse_str( $string, $array );
     1193    if ( get_magic_quotes_gpc() )
     1194        $array = stripslashes_deep( $array ); // parse_str() adds slashes if magicquotes is on.  See: http://php.net/parse_str
     1195    $array = apply_filters( 'wp_parse_str', $array );
     1196}
     1197
    11911198?>
  • trunk/wp-includes/functions.php

    r5705 r5709  
    605605    }
    606606
    607     parse_str($query, $qs);
    608     if ( get_magic_quotes_gpc() )
    609         $qs = stripslashes_deep($qs); // parse_str() adds slashes if magicquotes is on.  See: http://php.net/parse_str
     607    wp_parse_str($query, $qs);
    610608    $qs = urlencode_deep($qs);
    611609    if ( is_array(func_get_arg(0)) ) {
     
    12891287
    12901288function wp_parse_args( $args, $defaults = '' ) {
    1291     if ( is_array( $args ) ) {
     1289    if ( is_array( $args ) )
    12921290        $r =& $args;
    1293     } else {
    1294         parse_str( $args, $r );
    1295         if ( get_magic_quotes_gpc() ) {
    1296             $r = stripslashes_deep( $r );
    1297         }
    1298     }
    1299 
    1300     if ( is_array( $defaults ) ) {
     1291    else
     1292        wp_parse_str( $args, $r );
     1293
     1294    if ( is_array( $defaults ) )
    13011295        return array_merge( $defaults, $r );
    1302     } else {
     1296    else
    13031297        return $r;
    1304     }
    13051298}
    13061299
  • trunk/wp-includes/general-template.php

    r5708 r5709  
    969969}
    970970
    971 function paginate_links( $arg = '' ) {
    972     if ( is_array($arg) )
    973         $a = &$arg;
    974     else
    975         parse_str($arg, $a);
    976 
    977     // Defaults
    978     $base = '%_%'; // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
    979     $format = '?page=%#%'; // ?page=%#% : %#% is replaced by the page number
    980     $total = 1;
    981     $current = 0;
    982     $show_all = false;
    983     $prev_next = true;
    984     $prev_text = __('« Previous');
    985     $next_text = __('Next »');
    986     $end_size = 1; // How many numbers on either end including the end
    987     $mid_size = 2; // How many numbers to either side of current not including current
    988     $type = 'plain';
    989     $add_args = false; // array of query args to aadd
    990 
    991     extract($a);
     971function paginate_links( $args = '' ) {
     972    $defaults = array(
     973        'base' => '%_%', // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
     974        'format' => '?page=%#%', // ?page=%#% : %#% is replaced by the page number
     975        'total' => 1,
     976        'current' => 0,
     977        'show_all' => false,
     978        'prev_next' => true,
     979        'prev_text' => __('« Previous'),
     980        'next_text' => __('Next »'),
     981        'end_size' => 1, // How many numbers on either end including the end
     982        'mid_size' => 2, // How many numbers to either side of current not including current
     983        'type' => 'plain',
     984        'add_args' => false // array of query args to aadd
     985    );
     986
     987    $args = wp_parse_args( $args, $defaults );
     988    extract($args, EXTR_SKIP);
    992989
    993990    // Who knows what else people pass in $args
Note: See TracChangeset for help on using the changeset viewer.