WordPress 4.1.3

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

diff --git a/wp-admin/includes/bookmark.php b/wp-admin/includes/bookmark.php
index 0897fdc5a42230a728091bfbaa73c0b15d32cd5d..b73df8b8aad34220e728e8fbe132620f51f2d074 100644 (file)
--- a/wp-admin/includes/bookmark.php
+++ b/wp-admin/includes/bookmark.php
@@ -27,7 +27,7 @@ function add_link() {
  */
 function edit_link( $link_id = 0 ) {
        if ( !current_user_can( 'manage_links' ) )
-               wp_die( __( 'Cheatin’ uh?' ) );
+               wp_die( __( 'Cheatin’ uh?' ), 403 );
 
        $_POST['link_url'] = esc_html( $_POST['link_url'] );
        $_POST['link_url'] = esc_url($_POST['link_url']);
@@ -50,7 +50,7 @@ function edit_link( $link_id = 0 ) {
  *
  * @since 2.0.0
  *
- * @return object Default link
+ * @return stdClass Default link
  */
 function get_default_link_to_edit() {
        $link = new stdClass;
@@ -70,7 +70,7 @@ function get_default_link_to_edit() {
 }
 
 /**
- * Delete link specified from database
+ * Delete link specified from database.
  *
  * @since 2.0.0
  *
@@ -79,13 +79,25 @@ function get_default_link_to_edit() {
  */
 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 );
@@ -134,15 +146,17 @@ function wp_insert_link( $linkdata, $wp_error = false ) {
 
        $defaults = array( 'link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0 );
 
-       $linkdata = wp_parse_args( $linkdata, $defaults );
-       $linkdata = sanitize_bookmark( $linkdata, 'db' );
+       $args = wp_parse_args( $linkdata, $defaults );
+       $r = wp_unslash( sanitize_bookmark( $args, 'db' ) );
 
-       extract( wp_unslash( $linkdata ), EXTR_SKIP );
+       $link_id   = $r['link_id'];
+       $link_name = $r['link_name'];
+       $link_url  = $r['link_url'];
 
        $update = false;
-
-       if ( !empty( $link_id ) )
+       if ( ! empty( $link_id ) ) {
                $update = true;
+       }
 
        if ( trim( $link_name ) == '' ) {
                if ( trim( $link_url ) != '' ) {
@@ -152,65 +166,66 @@ function wp_insert_link( $linkdata, $wp_error = false ) {
                }
        }
 
-       if ( trim( $link_url ) == '' )
+       if ( trim( $link_url ) == '' ) {
                return 0;
+       }
 
-       if ( empty( $link_rating ) )
-               $link_rating = 0;
-
-       if ( empty( $link_image ) )
-               $link_image = '';
-
-       if ( empty( $link_target ) )
-               $link_target = '';
-
-       if ( empty( $link_visible ) )
-               $link_visible = 'Y';
-
-       if ( empty( $link_owner ) )
-               $link_owner = get_current_user_id();
-
-       if ( empty( $link_notes ) )
-               $link_notes = '';
-
-       if ( empty( $link_description ) )
-               $link_description = '';
-
-       if ( empty( $link_rss ) )
-               $link_rss = '';
-
-       if ( empty( $link_rel ) )
-               $link_rel = '';
+       $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 ( ! isset( $link_category ) || 0 == count( $link_category ) || !is_array( $link_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 )
+               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
+                       } 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 )
+               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
+                       } else {
                                return 0;
+                       }
                }
                $link_id = (int) $wpdb->insert_id;
        }
 
        wp_set_link_cats( $link_id, $link_category );
 
-       if ( $update )
+       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
+       } 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;