Ticket #36120: 36120.patch

src/wp-admin/includes/bookmark.php

@@ -75 +75 @@
 }
 
 /**
- * Deletes a specified link from the database.
- *
- * @since 2.0.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param int $link_id ID of the link to delete
- * @return true Always true.
- */
-function wp_delete_link( $link_id ) {
-        global $wpdb;
-        /**
-         * Fires before a link is deleted.
-         *
-         * @since 2.0.0
-         *
-         * @param int $link_id ID of the link to delete.
-         */
-        do_action( 'delete_link', $link_id );
-
-        wp_delete_object_term_relationships( $link_id, 'link_category' );
-
-        $wpdb->delete( $wpdb->links, array( 'link_id' => $link_id ) );
-
-        /**
-         * Fires after a link has been deleted.
-         *
-         * @since 2.2.0
-         *
-         * @param int $link_id ID of the deleted link.
-         */
-        do_action( 'deleted_link', $link_id );
-
-        clean_bookmark_cache( $link_id );
-
-        return true;
-}
-
-/**
  * Retrieves the link categories associated with the link specified.
  *
  * @since 2.1.0
@@ -139 +100 @@
 }
 
 /**
- * Inserts/updates links into/in the database.
- *
- * @since 2.0.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param array $linkdata Elements that make up the link to insert.
- * @param bool  $wp_error Optional. Whether to return a WP_Error object on failure. Default false.
- * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
- */
-function wp_insert_link( $linkdata, $wp_error = false ) {
-        global $wpdb;
-
-        $defaults = array( 'link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0 );
-
-        $args = wp_parse_args( $linkdata, $defaults );
-        $r = wp_unslash( sanitize_bookmark( $args, 'db' ) );
-
-        $link_id   = $r['link_id'];
-        $link_name = $r['link_name'];
-        $link_url  = $r['link_url'];
-
-        $update = false;
-        if ( ! empty( $link_id ) ) {
-                $update = true;
-        }
-
-        if ( trim( $link_name ) == '' ) {
-                if ( trim( $link_url ) != '' ) {
-                        $link_name = $link_url;
-                } else {
-                        return 0;
-                }
-        }
-
-        if ( trim( $link_url ) == '' ) {
-                return 0;
-        }
-
-        $link_rating      = ( ! empty( $r['link_rating'] ) ) ? $r['link_rating'] : 0;
-        $link_image       = ( ! empty( $r['link_image'] ) ) ? $r['link_image'] : '';
-        $link_target      = ( ! empty( $r['link_target'] ) ) ? $r['link_target'] : '';
-        $link_visible     = ( ! empty( $r['link_visible'] ) ) ? $r['link_visible'] : 'Y';
-        $link_owner       = ( ! empty( $r['link_owner'] ) ) ? $r['link_owner'] : get_current_user_id();
-        $link_notes       = ( ! empty( $r['link_notes'] ) ) ? $r['link_notes'] : '';
-        $link_description = ( ! empty( $r['link_description'] ) ) ? $r['link_description'] : '';
-        $link_rss         = ( ! empty( $r['link_rss'] ) ) ? $r['link_rss'] : '';
-        $link_rel         = ( ! empty( $r['link_rel'] ) ) ? $r['link_rel'] : '';
-        $link_category    = ( ! empty( $r['link_category'] ) ) ? $r['link_category'] : array();
-
-        // Make sure we set a valid category.
-        if ( ! is_array( $link_category ) || 0 == count( $link_category ) ) {
-                $link_category = array( get_option( 'default_link_category' ) );
-        }
-
-        if ( $update ) {
-                if ( false === $wpdb->update( $wpdb->links, compact( 'link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_rating', 'link_rel', 'link_notes', 'link_rss' ), compact( 'link_id' ) ) ) {
-                        if ( $wp_error ) {
-                                return new WP_Error( 'db_update_error', __( 'Could not update link in the database' ), $wpdb->last_error );
-                        } else {
-                                return 0;
-                        }
-                }
-        } else {
-                if ( false === $wpdb->insert( $wpdb->links, compact( 'link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_rel', 'link_notes', 'link_rss' ) ) ) {
-                        if ( $wp_error ) {
-                                return new WP_Error( 'db_insert_error', __( 'Could not insert link into the database' ), $wpdb->last_error );
-                        } else {
-                                return 0;
-                        }
-                }
-                $link_id = (int) $wpdb->insert_id;
-        }
-
-        wp_set_link_cats( $link_id, $link_category );
-
-        if ( $update ) {
-                /**
-                 * Fires after a link was updated in the database.
-                 *
-                 * @since 2.0.0
-                 *
-                 * @param int $link_id ID of the link that was updated.
-                 */
-                do_action( 'edit_link', $link_id );
-        } else {
-                /**
-                 * Fires after a link was added to the database.
-                 *
-                 * @since 2.0.0
-                 *
-                 * @param int $link_id ID of the link that was added.
-                 */
-                do_action( 'add_link', $link_id );
-        }
-        clean_bookmark_cache( $link_id );
-
-        return $link_id;
-}
-
-/**
- * Update link with the specified link categories.
- *
- * @since 2.1.0
- *
- * @param int   $link_id         ID of the link to update.
- * @param array $link_categories Array of link categories to add the link to.
- */
-function wp_set_link_cats( $link_id = 0, $link_categories = array() ) {
-        // If $link_categories isn't already an array, make it one:
-        if ( !is_array( $link_categories ) || 0 == count( $link_categories ) )
-                $link_categories = array( get_option( 'default_link_category' ) );
-
-        $link_categories = array_map( 'intval', $link_categories );
-        $link_categories = array_unique( $link_categories );
-
-        wp_set_object_terms( $link_id, $link_categories, 'link_category' );
-
-        clean_bookmark_cache( $link_id );
-}
-
-/**
- * Updates a link in the database.
- *
- * @since 2.0.0
- *
- * @param array $linkdata Link data to update.
- * @return int|WP_Error Value 0 or WP_Error on failure. The updated link ID on success.
- */
-function wp_update_link( $linkdata ) {
-        $link_id = (int) $linkdata['link_id'];
-
-        $link = get_bookmark( $link_id, ARRAY_A );
-
-        // Escape data pulled from DB.
-        $link = wp_slash( $link );
-
-        // Passed link category list overwrites existing category list if not empty.
-        if ( isset( $linkdata['link_category'] ) && is_array( $linkdata['link_category'] )
-                         && 0 != count( $linkdata['link_category'] ) )
-                $link_cats = $linkdata['link_category'];
-        else
-                $link_cats = $link['link_category'];
-
-        // Merge old and new fields with new fields overwriting old ones.
-        $linkdata = array_merge( $link, $linkdata );
-        $linkdata['link_category'] = $link_cats;
-
-        return wp_insert_link( $linkdata );
-}
-
-/**
  * Outputs the 'disabled' message for the WordPress Link Manager.
  *
  * @since 3.5.0

src/wp-includes/bookmark.php

@@ -415 +415 @@
         wp_cache_delete( 'get_bookmarks', 'bookmark' );
         clean_object_term_cache( $bookmark_id, 'link');
 }
+
+/**
+ * Deletes a specified link from the database.
+ *
+ * @since 2.0.0
+ *
+ * @global wpdb $wpdb    WordPress database abstraction object.
+ *
+ * @param int   $link_id ID of the link to delete
+ *
+ * @return true Always true.
+ */
+function wp_delete_link( $link_id ) {
+        global $wpdb;
+        /**
+         * Fires before a link is deleted.
+         *
+         * @since 2.0.0
+         *
+         * @param int $link_id ID of the link to delete.
+         */
+        do_action( 'delete_link', $link_id );
+
+        wp_delete_object_term_relationships( $link_id, 'link_category' );
+
+        $wpdb->delete( $wpdb->links, array( 'link_id' => $link_id ) );
+
+        /**
+         * Fires after a link has been deleted.
+         *
+         * @since 2.2.0
+         *
+         * @param int $link_id ID of the deleted link.
+         */
+        do_action( 'deleted_link', $link_id );
+
+        clean_bookmark_cache( $link_id );
+
+        return true;
+}
+
+/**
+ * Inserts/updates links into/in the database.
+ *
+ * @since 2.0.0
+ *
+ * @global wpdb $wpdb     WordPress database abstraction object.
+ *
+ * @param array $linkdata Elements that make up the link to insert.
+ * @param bool  $wp_error Optional. Whether to return a WP_Error object on failure. Default false.
+ *
+ * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
+ */
+function wp_insert_link( $linkdata, $wp_error = false ) {
+        global $wpdb;
+
+        $defaults = array( 'link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0 );
+
+        $args = wp_parse_args( $linkdata, $defaults );
+        $r    = wp_unslash( sanitize_bookmark( $args, 'db' ) );
+
+        $link_id   = $r['link_id'];
+        $link_name = $r['link_name'];
+        $link_url  = $r['link_url'];
+
+        $update = false;
+        if ( ! empty( $link_id ) ) {
+                $update = true;
+        }
+
+        if ( trim( $link_name ) == '' ) {
+                if ( trim( $link_url ) != '' ) {
+                        $link_name = $link_url;
+                } else {
+                        return 0;
+                }
+        }
+
+        if ( trim( $link_url ) == '' ) {
+                return 0;
+        }
+
+        $link_rating      = ( ! empty( $r['link_rating'] ) ) ? $r['link_rating'] : 0;
+        $link_image       = ( ! empty( $r['link_image'] ) ) ? $r['link_image'] : '';
+        $link_target      = ( ! empty( $r['link_target'] ) ) ? $r['link_target'] : '';
+        $link_visible     = ( ! empty( $r['link_visible'] ) ) ? $r['link_visible'] : 'Y';
+        $link_owner       = ( ! empty( $r['link_owner'] ) ) ? $r['link_owner'] : get_current_user_id();
+        $link_notes       = ( ! empty( $r['link_notes'] ) ) ? $r['link_notes'] : '';
+        $link_description = ( ! empty( $r['link_description'] ) ) ? $r['link_description'] : '';
+        $link_rss         = ( ! empty( $r['link_rss'] ) ) ? $r['link_rss'] : '';
+        $link_rel         = ( ! empty( $r['link_rel'] ) ) ? $r['link_rel'] : '';
+        $link_category    = ( ! empty( $r['link_category'] ) ) ? $r['link_category'] : array();
+
+        // Make sure we set a valid category.
+        if ( ! is_array( $link_category ) || 0 == count( $link_category ) ) {
+                $link_category = array( get_option( 'default_link_category' ) );
+        }
+
+        if ( $update ) {
+                if ( false === $wpdb->update( $wpdb->links, compact( 'link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_rating', 'link_rel', 'link_notes', 'link_rss' ), compact( 'link_id' ) ) ) {
+                        if ( $wp_error ) {
+                                return new WP_Error( 'db_update_error', __( 'Could not update link in the database' ), $wpdb->last_error );
+                        } else {
+                                return 0;
+                        }
+                }
+        } else {
+                if ( false === $wpdb->insert( $wpdb->links, compact( 'link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_rel', 'link_notes', 'link_rss' ) ) ) {
+                        if ( $wp_error ) {
+                                return new WP_Error( 'db_insert_error', __( 'Could not insert link into the database' ), $wpdb->last_error );
+                        } else {
+                                return 0;
+                        }
+                }
+                $link_id = (int) $wpdb->insert_id;
+        }
+
+        wp_set_link_cats( $link_id, $link_category );
+
+        if ( $update ) {
+                /**
+                 * Fires after a link was updated in the database.
+                 *
+                 * @since 2.0.0
+                 *
+                 * @param int $link_id ID of the link that was updated.
+                 */
+                do_action( 'edit_link', $link_id );
+        } else {
+                /**
+                 * Fires after a link was added to the database.
+                 *
+                 * @since 2.0.0
+                 *
+                 * @param int $link_id ID of the link that was added.
+                 */
+                do_action( 'add_link', $link_id );
+        }
+        clean_bookmark_cache( $link_id );
+
+        return $link_id;
+}
+
+/**
+ * Updates a link in the database.
+ *
+ * @since 2.0.0
+ *
+ * @param array $linkdata Link data to update.
+ *
+ * @return int|WP_Error Value 0 or WP_Error on failure. The updated link ID on success.
+ */
+function wp_update_link( $linkdata ) {
+        $link_id = (int) $linkdata['link_id'];
+
+        $link = get_bookmark( $link_id, ARRAY_A );
+
+        // Escape data pulled from DB.
+        $link = wp_slash( $link );
+
+        // Passed link category list overwrites existing category list if not empty.
+        if ( isset( $linkdata['link_category'] ) && is_array( $linkdata['link_category'] )
+             && 0 != count( $linkdata['link_category'] )
+        ) {
+                $link_cats = $linkdata['link_category'];
+        } else {
+                $link_cats = $link['link_category'];
+        }
+
+        // Merge old and new fields with new fields overwriting old ones.
+        $linkdata                  = array_merge( $link, $linkdata );
+        $linkdata['link_category'] = $link_cats;
+
+        return wp_insert_link( $linkdata );
+}
+
+/**
+ * Update link with the specified link categories.
+ *
+ * @since 2.1.0
+ *
+ * @param int   $link_id         ID of the link to update.
+ * @param array $link_categories Array of link categories to add the link to.
+ */
+function wp_set_link_cats( $link_id = 0, $link_categories = array() ) {
+        // If $link_categories isn't already an array, make it one:
+        if ( ! is_array( $link_categories ) || 0 == count( $link_categories ) ) {
+                $link_categories = array( get_option( 'default_link_category' ) );
+        }
+
+        $link_categories = array_map( 'intval', $link_categories );
+        $link_categories = array_unique( $link_categories );
+
+        wp_set_object_terms( $link_id, $link_categories, 'link_category' );
+
+        clean_bookmark_cache( $link_id );
+}