Wordpress 3.5.2-scripts

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

diff --git a/wp-admin/includes/bookmark.php b/wp-admin/includes/bookmark.php
index 0ed560c1913986eed2f7506625e7b1d5f6f49478..4d240b775c13f791de2deff3ea6a052c9db0cc96 100644 (file)
--- a/wp-admin/includes/bookmark.php
+++ b/wp-admin/includes/bookmark.php
@@ -53,6 +53,7 @@ function edit_link( $link_id = 0 ) {
  * @return object Default link
  */
 function get_default_link_to_edit() {
+       $link = new stdClass;
        if ( isset( $_GET['linkurl'] ) )
                $link->link_url = esc_url( $_GET['linkurl'] );
        else
@@ -83,7 +84,7 @@ function wp_delete_link( $link_id ) {
 
        wp_delete_object_term_relationships( $link_id, 'link_category' );
 
-       $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->links WHERE link_id = %d", $link_id ) );
+       $wpdb->delete( $wpdb->links, array( 'link_id' => $link_id ) );
 
        do_action( 'deleted_link', $link_id );
 
@@ -266,4 +267,24 @@ function wp_update_link( $linkdata ) {
        return wp_insert_link( $linkdata );
 }
 
-?>
+/**
+ * @since 3.5.0
+ * @access private
+ */
+function wp_link_manager_disabled_message() {
+       global $pagenow;
+       if ( 'link-manager.php' != $pagenow && 'link-add.php' != $pagenow && 'link.php' != $pagenow )
+               return;
+
+       add_filter( 'pre_option_link_manager_enabled', '__return_true', 100 );
+       $really_can_manage_links = current_user_can( 'manage_links' );
+       remove_filter( 'pre_option_link_manager_enabled', '__return_true', 100 );
+
+       if ( $really_can_manage_links && current_user_can( 'install_plugins' ) ) {
+               $link = network_admin_url( 'plugin-install.php?tab=search&s=Link+Manager' );
+               wp_die( sprintf( __( 'If you are looking to use the link manager, please install the <a href="%s">Link Manager</a> plugin.' ), $link ) );
+       }
+
+       wp_die( __( 'You do not have sufficient permissions to edit the links for this site.' ) );
+}
+add_action( 'admin_page_access_denied', 'wp_link_manager_disabled_message' );