Changeset 21829 for trunk/wp-includes/bookmark.php

Timestamp:

09/13/2012 04:41:43 PM (14 years ago)

Author:

nacin

Message:

Don't cache a non-existent link in get_bookmark(). props wonderboymusic, fixes #21159.

File:

• trunk/wp-includes/bookmark.php (modified) (1 diff)

trunk/wp-includes/bookmark.php

@@ -34 +34 @@
                 } 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', array('fields' => 'ids')) );
-                        wp_cache_add($_bookmark->link_id, $_bookmark, 'bookmark');
-                }
-        }
+                        if ( $_bookmark ) {
+                                $_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' );
+                        }
+                }
+        }
+
+        if ( ! $_bookmark )
+                return $_bookmark;
 
         $_bookmark = sanitize_bookmark($_bookmark, $filter);