Changeset 12525

Timestamp:

12/23/2009 06:49:22 PM (14 years ago)

Author:

ryan

Message:

Refresh deprecated bookmark functions. Props filosofo. fixes #10920

Location:

trunk/wp-includes

Files:

• bookmark-template.php (modified) (1 diff)
• deprecated.php (modified) (4 diffs)

trunk/wp-includes/bookmark-template.php

@@ -154 +154 @@
  * 'categorize' - Default is 1 (integer). Whether to show links listed by
  *      category (default) or show links in one column.
+ * 'show_description' - Default is 0 (integer). Whether to show the description
+ *      of the bookmark.
  *
  * These options define how the Category name will appear before the category

trunk/wp-includes/deprecated.php

@@ -472 +472 @@
  *
  * @since 1.0.1
- * @deprecated Use wp_get_links()
- * @see wp_get_links()
+ * @deprecated Use wp_list_bookmarks()
+ * @see wp_list_bookmarks()
  *
  * @param string $category The category to use.
@@ -480 +480 @@
  */
 function wp_get_linksbyname($category, $args = '') {
-    _deprecated_function(__FUNCTION__, '0.0', 'wp_get_links()');
-
-    $cat = get_term_by('name', $category, 'link_category');
-    if ( !$cat )
-        return false;
-    $cat_id = $cat->term_id;
-
-    $args = add_query_arg('category', $cat_id, $args);
-    wp_get_links($args);
+    _deprecated_function(__FUNCTION__, '0.0', 'wp_list_bookmarks()');
+
+    $defaults = array(
+        'after' => '<br />',
+        'before' => '',
+        'categorize' => 0,
+        'category_after' => '',
+        'category_before' => '',
+        'category_name' => $category,
+        'show_description' => 1,
+        'title_li' => '',
+    );
+    
+    $r = wp_parse_args( $args, $defaults );
+
+    return wp_list_bookmarks($r);
 }
 
@@ -928 +935 @@
  */
 function wp_get_links($args = '') {
-    _deprecated_function(__FUNCTION__, '0.0', 'get_bookmarks()');
+    _deprecated_function(__FUNCTION__, '0.0', 'wp_list_bookmarks()');
 
     if ( strpos( $args, '=' ) === false ) {
@@ -936 +943 @@
 
     $defaults = array(
-        'category' => -1, 'before' => '',
-        'after' => '<br />', 'between' => ' ',
-        'show_images' => true, 'orderby' => 'name',
-        'show_description' => true, 'show_rating' => false,
-        'limit' => -1, 'show_updated' => true,
-        'echo' => true
+        'after' => '<br />', 
+        'before' => '',
+        'between' => ' ',
+        'categorize' => 0,
+        'category' => '', 
+        'echo' => true,
+        'limit' => -1, 
+        'orderby' => 'name',
+        'show_description' => true, 
+        'show_images' => true, 
+        'show_rating' => false,
+        'show_updated' => true,
+        'title_li' => '',
     );
 
     $r = wp_parse_args( $args, $defaults );
-    extract( $r, EXTR_SKIP );
-
-    return get_links($category, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated, $echo);
+    
+    return wp_list_bookmarks($r);
 }