diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-06-21 16:41:02 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-06-21 16:41:02 +0000 |
| commit | a5fe68e002632c190ffbd85167671ed4d4961135 (patch) | |
| tree | ae57f94603111507c50cb3c212a03bedf8f7dc5a /wp-includes/bookmark.php | |
| parent | 4e38776b5b68c61a4593a84340f4654200f7568e (diff) | |
| download | wordpress-mu-a5fe68e002632c190ffbd85167671ed4d4961135.tar.gz wordpress-mu-a5fe68e002632c190ffbd85167671ed4d4961135.tar.xz wordpress-mu-a5fe68e002632c190ffbd85167671ed4d4961135.zip | |
WP Merge to WP 2.2.1
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1005 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/bookmark.php')
| -rw-r--r-- | wp-includes/bookmark.php | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/wp-includes/bookmark.php b/wp-includes/bookmark.php index ad2e696..aca1e72 100644 --- a/wp-includes/bookmark.php +++ b/wp-includes/bookmark.php @@ -25,17 +25,16 @@ function get_link($bookmark_id, $output = OBJECT) { function get_bookmarks($args = '') { global $wpdb; - - $defaults = array( - 'orderby' => 'name', 'order' => 'ASC', - 'limit' => -1, 'category' => '', - 'category_name' => '', 'hide_invisible' => 1, - 'show_updated' => 0, 'include' => '', - 'exclude' => '' - ); - - $r = wp_parse_args( $args, $defaults ); - extract( $r ); + + if ( is_array($args) ) + $r = &$args; + else + parse_str($args, $r); + + $defaults = array('orderby' => 'name', 'order' => 'ASC', 'limit' => -1, 'category' => '', + 'category_name' => '', 'hide_invisible' => 1, 'show_updated' => 0, 'include' => '', 'exclude' => ''); + $r = array_merge($defaults, $r); + extract($r, EXTR_SKIP); $key = md5( serialize( $r ) ); if ( $cache = wp_cache_get( 'get_bookmarks', 'bookmark' ) ) |