Wordpress 3.0

[autoinstalls/wordpress.git] / wp-includes / bookmark.php

diff --git a/wp-includes/bookmark.php b/wp-includes/bookmark.php
index c406fcaf5003dd16e5d9bc725963381c15ac6b29..641ae3b4935d2c9f25972ee34eb8b6f66ed393d8 100644 (file)
--- a/wp-includes/bookmark.php
+++ b/wp-includes/bookmark.php
@@ -33,7 +33,7 @@ function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') {
                        $_bookmark = & $GLOBALS['link'];
                } elseif ( ! $_bookmark = wp_cache_get($bookmark, 'bookmark') ) {
                        $_bookmark = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->links WHERE link_id = %d LIMIT 1", $bookmark));
-                       $_bookmark->link_category = array_unique( wp_get_object_terms($_bookmark->link_id, 'link_category', 'fields=ids') );
+                       $_bookmark->link_category = array_unique( wp_get_object_terms($_bookmark->link_id, 'link_category', array('fields' => 'ids')) );
                        wp_cache_add($_bookmark->link_id, $_bookmark, 'bookmark');
                }
        }
@@ -79,21 +79,6 @@ function get_bookmark_field( $field, $bookmark, $context = 'display' ) {
        return sanitize_bookmark_field($field, $bookmark->$field, $bookmark->link_id, $context);
 }
 
-/**
- * Retrieve bookmark data based on ID.
- *
- * @since 2.0.0
- * @deprecated Use get_bookmark()
- * @see get_bookmark()
- *
- * @param int $bookmark_id ID of link
- * @param string $output Either OBJECT, ARRAY_N, or ARRAY_A
- * @return object|array
- */
-function get_link($bookmark_id, $output = OBJECT, $filter = 'raw') {
-       return get_bookmark($bookmark_id, $output, $filter);
-}
-
 /**
  * Retrieves the list of bookmarks
  *
@@ -236,7 +221,10 @@ function get_bookmarks($args = '') {
                        $orderby = 'rand()';
                        break;
                default:
-                       $orderby = "link_" . $orderby;
+                       $orderparams = array();
+                       foreach ( explode(',', $orderby) as $ordparam )
+                               $orderparams[] = 'link_' . trim($ordparam);
+                       $orderby = implode(',', $orderparams);
        }
 
        if ( 'link_id' == $orderby )
@@ -321,18 +309,25 @@ function sanitize_bookmark($bookmark, $context = 'display') {
  * @return mixed The filtered value
  */
 function sanitize_bookmark_field($field, $value, $bookmark_id, $context) {
-       $int_fields = array('link_id', 'link_rating');
-       if ( in_array($field, $int_fields) )
+       switch ( $field ) {
+       case 'link_id' : // ints
+       case 'link_rating' :
                $value = (int) $value;
-
-       $yesno = array('link_visible');
-       if ( in_array($field, $yesno) )
+               break;
+       case 'link_category' : // array( ints )
+               $value = array_map('absint', (array) $value);
+               // We return here so that the categories aren't filtered.
+               // The 'link_category' filter is for the name of a link category, not an array of a link's link categories
+               return $value;
+               break;
+       case 'link_visible' : // bool stored as Y|N
                $value = preg_replace('/[^YNyn]/', '', $value);
-
-       if ( 'link_target' == $field ) {
+               break;
+       case 'link_target' : // "enum"
                $targets = array('_top', '_blank');
                if ( ! in_array($value, $targets) )
                        $value = '';
+               break;
        }
 
        if ( 'raw' == $context )
@@ -352,12 +347,12 @@ function sanitize_bookmark_field($field, $value, $bookmark_id, $context) {
        } else {
                // Use display filters by default.
                $value = apply_filters($field, $value, $bookmark_id, $context);
-       }
 
-       if ( 'attribute' == $context )
-               $value = esc_attr($value);
-       else if ( 'js' == $context )
-               $value = esc_js($value);
+               if ( 'attribute' == $context )
+                       $value = esc_attr($value);
+               else if ( 'js' == $context )
+                       $value = esc_js($value);
+       }
 
        return $value;
 }