WordPress 4.3

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

diff --git a/wp-admin/includes/bookmark.php b/wp-admin/includes/bookmark.php
index 17a8229aa65897086cca43c10a9dac5fb0384a00..bdf1d7fa4026897e381aee4558eaba575c6ede6f 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' ) )
  */
 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']);
 
        $_POST['link_url'] = esc_html( $_POST['link_url'] );
        $_POST['link_url'] = esc_url($_POST['link_url']);


@@ -50,17 +50,17 @@ function edit_link( $link_id = 0 ) {
  *
  * @since 2.0.0
  *
  *
  * @since 2.0.0
  *

- * @return object Default link
+ * @return stdClass Default link

  */
 function get_default_link_to_edit() {
        $link = new stdClass;
        if ( isset( $_GET['linkurl'] ) )
  */
 function get_default_link_to_edit() {
        $link = new stdClass;
        if ( isset( $_GET['linkurl'] ) )

-               $link->link_url = esc_url( $_GET['linkurl'] );
+               $link->link_url = esc_url( wp_unslash( $_GET['linkurl'] ) );

        else
                $link->link_url = '';
 
        if ( isset( $_GET['name'] ) )
        else
                $link->link_url = '';
 
        if ( isset( $_GET['name'] ) )

-               $link->link_name = esc_attr( $_GET['name'] );
+               $link->link_name = esc_attr( wp_unslash( $_GET['name'] ) );

        else
                $link->link_name = '';
 
        else
                $link->link_name = '';
 


@@ -70,22 +70,36 @@ function get_default_link_to_edit() {
 }
 
 /**
 }
 
 /**

- * Delete link specified from database
+ * Delete link specified from database.

  *
  * @since 2.0.0
  *
  *
  * @since 2.0.0
  *

+ * @global wpdb $wpdb
+ *

  * @param int $link_id ID of the link to delete
  * @param int $link_id ID of the link to delete

- * @return bool True
+ * @return true

  */
 function wp_delete_link( $link_id ) {
        global $wpdb;
  */
 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 ) );
        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 );
        do_action( 'deleted_link', $link_id );
 
        clean_bookmark_cache( $link_id );


@@ -102,9 +116,7 @@ function wp_delete_link( $link_id ) {
  * @return array The requested link's categories
  */
 function wp_get_link_cats( $link_id = 0 ) {
  * @return array The requested link's categories
  */
 function wp_get_link_cats( $link_id = 0 ) {

-

        $cats = wp_get_object_terms( $link_id, 'link_category', array('fields' => 'ids') );
        $cats = wp_get_object_terms( $link_id, 'link_category', array('fields' => 'ids') );

-

        return array_unique( $cats );
 }
 
        return array_unique( $cats );
 }
 


@@ -125,8 +137,10 @@ function get_link_to_edit( $link_id ) {
  *
  * @since 2.0.0
  *
  *
  * @since 2.0.0
  *

+ * @global wpdb $wpdb
+ *

  * @param array $linkdata Elements that make up the link to insert.
  * @param array $linkdata Elements that make up the link to insert.

- * @param bool $wp_error Optional. If true return WP_Error object on failure.
+ * @param bool  $wp_error Optional. If true return WP_Error object on failure.

  * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
  */
 function wp_insert_link( $linkdata, $wp_error = 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 ) {


@@ -134,15 +148,17 @@ function wp_insert_link( $linkdata, $wp_error = false ) {
 
        $defaults = array( 'link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0 );
 
 
        $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( stripslashes_deep( $linkdata ), EXTR_SKIP );
+       $link_id   = $r['link_id'];
+       $link_name = $r['link_name'];
+       $link_url  = $r['link_url'];

 
        $update = false;
 
        $update = false;

-
-       if ( !empty( $link_id ) )
+       if ( ! empty( $link_id ) ) {

                $update = true;
                $update = true;

+       }

 
        if ( trim( $link_name ) == '' ) {
                if ( trim( $link_url ) != '' ) {
 
        if ( trim( $link_name ) == '' ) {
                if ( trim( $link_url ) != '' ) {


@@ -152,65 +168,66 @@ function wp_insert_link( $linkdata, $wp_error = false ) {
                }
        }
 
                }
        }
 

-       if ( trim( $link_url ) == '' )
+       if ( trim( $link_url ) == '' ) {

                return 0;
                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
 
        // 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 ) {
                $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 );
                                return new WP_Error( 'db_update_error', __( 'Could not update link in the database' ), $wpdb->last_error );

-                       else
+                       } else {

                                return 0;
                                return 0;

+                       }

                }
        } else {
                }
        } 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 );
                                return new WP_Error( 'db_insert_error', __( 'Could not insert link into the database' ), $wpdb->last_error );

-                       else
+                       } else {

                                return 0;
                                return 0;

+                       }

                }
                $link_id = (int) $wpdb->insert_id;
        }
 
        wp_set_link_cats( $link_id, $link_category );
 
                }
                $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 );
                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 );
                do_action( 'add_link', $link_id );

-
+       }

        clean_bookmark_cache( $link_id );
 
        return $link_id;
        clean_bookmark_cache( $link_id );
 
        return $link_id;


@@ -251,7 +268,7 @@ function wp_update_link( $linkdata ) {
        $link = get_bookmark( $link_id, ARRAY_A );
 
        // Escape data pulled from DB.
        $link = get_bookmark( $link_id, ARRAY_A );
 
        // Escape data pulled from DB.

-       $link = add_magic_quotes( $link );
+       $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'] )
 
        // Passed link category list overwrites existing category list if not empty.
        if ( isset( $linkdata['link_category'] ) && is_array( $linkdata['link_category'] )


@@ -266,3 +283,26 @@ function wp_update_link( $linkdata ) {
 
        return wp_insert_link( $linkdata );
 }
 
        return wp_insert_link( $linkdata );
 }

+
+/**
+ * @since 3.5.0
+ * @access private
+ *
+ * @global string $pagenow
+ */
+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.' ) );
+}