WordPress 3.4

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

diff --git a/wp-includes/bookmark.php b/wp-includes/bookmark.php
index e1184231c445ddab03756e9a53ad1e96c5edcb15..8248e3a64f69653647c6e0c379d16d4be1775169 100644 (file)
--- a/wp-includes/bookmark.php
+++ b/wp-includes/bookmark.php
@@ -101,9 +101,9 @@ function get_bookmark_field( $field, $bookmark, $context = 'display' ) {
  *             links marked as 'invisible'.
  * 'show_updated' - Default is 0 (integer). Will show the time of when the
  *             bookmark was last updated.
  *             links marked as 'invisible'.
  * 'show_updated' - Default is 0 (integer). Will show the time of when the
  *             bookmark was last updated.

- * 'include' - Default is empty string (string). Include other categories
+ * 'include' - Default is empty string (string). Include bookmark ID(s)

  *             separated by commas.
  *             separated by commas.

- * 'exclude' - Default is empty string (string). Exclude other categories
+ * 'exclude' - Default is empty string (string). Exclude bookmark ID(s)

  *             separated by commas.
  *
  * @since 2.1.0
  *             separated by commas.
  *
  * @since 2.1.0


@@ -227,8 +227,11 @@ function get_bookmarks($args = '') {
                        $orderparams = array();
                        foreach ( explode(',', $orderby) as $ordparam ) {
                                $ordparam = trim($ordparam);
                        $orderparams = array();
                        foreach ( explode(',', $orderby) as $ordparam ) {
                                $ordparam = trim($ordparam);

-                               if ( in_array( $ordparam, array( 'name', 'url', 'visible', 'rating', 'owner', 'updated' ) ) )
+                               $keys = array( 'link_id', 'link_name', 'link_url', 'link_visible', 'link_rating', 'link_owner', 'link_updated', 'link_notes' );
+                               if ( in_array( 'link_' . $ordparam, $keys ) )

                                        $orderparams[] = 'link_' . $ordparam;
                                        $orderparams[] = 'link_' . $ordparam;

+                               elseif ( in_array( $ordparam, $keys ) )
+                                       $orderparams[] = $ordparam;

                        }
                        $orderby = implode(',', $orderparams);
        }
                        }
                        $orderby = implode(',', $orderparams);
        }


@@ -372,9 +375,8 @@ function sanitize_bookmark_field($field, $value, $bookmark_id, $context) {
  * @since 2.7.0
  * @uses wp_cache_delete() Deletes the contents of 'get_bookmarks'
  */
  * @since 2.7.0
  * @uses wp_cache_delete() Deletes the contents of 'get_bookmarks'
  */

-function clean_bookmark_cache($bookmark_id) {
+function clean_bookmark_cache( $bookmark_id ) {

        wp_cache_delete( $bookmark_id, 'bookmark' );
        wp_cache_delete( 'get_bookmarks', 'bookmark' );
        wp_cache_delete( $bookmark_id, 'bookmark' );
        wp_cache_delete( 'get_bookmarks', 'bookmark' );

+       clean_object_term_cache( $bookmark_id, 'link');

 }
 }

-
-?>