X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..f8ce8fee333796f41d394479265f31b87bd6e436:/wp-includes/bookmark.php?ds=sidebyside

diff --git a/wp-includes/bookmark.php b/wp-includes/bookmark.php
index 3a04a5cd..641ae3b4 100644
--- 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
  *
@@ -142,10 +127,15 @@ function get_bookmarks($args = '') {
 	$r = wp_parse_args( $args, $defaults );
 	extract( $r, EXTR_SKIP );
 
+	$cache = array();
 	$key = md5( serialize( $r ) );
-	if ( $cache = wp_cache_get( 'get_bookmarks', 'bookmark' ) )
-		if ( isset( $cache[ $key ] ) )
+	if ( $cache = wp_cache_get( 'get_bookmarks', 'bookmark' ) ) {
+		if ( is_array($cache) && isset( $cache[ $key ] ) )
 			return apply_filters('get_bookmarks', $cache[ $key ], $r );
+	}
+
+	if ( !is_array($cache) )
+		$cache = array();
 
 	$inclusions = '';
 	if ( !empty($include) ) {
@@ -180,9 +170,14 @@ function get_bookmarks($args = '') {
 	if (!empty($exclusions))
 		$exclusions .= ')';
 
-	if ( ! empty($category_name) ) {
-		if ( $category = get_term_by('name', $category_name, 'link_category') )
+	if ( !empty($category_name) ) {
+		if ( $category = get_term_by('name', $category_name, 'link_category') ) {
 			$category = $category->term_id;
+		} else {
+			$cache[ $key ] = array();
+			wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
+			return apply_filters( 'get_bookmarks', array(), $r );
+		}
 	}
 
 	if ( ! empty($search) ) {
@@ -208,7 +203,7 @@ function get_bookmarks($args = '') {
 		$join = " INNER JOIN $wpdb->term_relationships AS tr ON ($wpdb->links.link_id = tr.object_id) INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_taxonomy_id = tr.term_taxonomy_id";
 	}
 
-	if (get_option('links_recently_updated_time')) {
+	if ( $show_updated && get_option('links_recently_updated_time') ) {
 		$recently_updated_test = ", IF (DATE_ADD(link_updated, INTERVAL " . get_option('links_recently_updated_time') . " MINUTE) >= NOW(), 1,0) as recently_updated ";
 	} else {
 		$recently_updated_test = '';
@@ -226,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 )
@@ -311,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 )
@@ -335,19 +340,19 @@ function sanitize_bookmark_field($field, $value, $bookmark_id, $context) {
 		if ( in_array($field, $format_to_edit) ) {
 			$value = format_to_edit($value);
 		} else {
-			$value = attribute_escape($value);
+			$value = esc_attr($value);
 		}
 	} else if ( 'db' == $context ) {
 		$value = apply_filters("pre_$field", $value);
 	} else {
 		// Use display filters by default.
 		$value = apply_filters($field, $value, $bookmark_id, $context);
-	}
 
-	if ( 'attribute' == $context )
-		$value = attribute_escape($value);
-	else if ( 'js' == $context )
-		$value = js_escape($value);
+		if ( 'attribute' == $context )
+			$value = esc_attr($value);
+		else if ( 'js' == $context )
+			$value = esc_js($value);
+	}
 
 	return $value;
 }