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 43ccd418cfd1237f945ed1e15cbf8b4fbd209132..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,7 +50,7 @@ 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;
  */
 function get_default_link_to_edit() {
        $link = new stdClass;


@@ -74,8 +74,10 @@ function get_default_link_to_edit() {
  *
  * @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;


@@ -114,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 );
 }
 


@@ -137,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 ) {


@@ -285,6 +287,8 @@ function wp_update_link( $linkdata ) {
 /**
  * @since 3.5.0
  * @access private
 /**
  * @since 3.5.0
  * @access private

+ *
+ * @global string $pagenow

  */
 function wp_link_manager_disabled_message() {
        global $pagenow;
  */
 function wp_link_manager_disabled_message() {
        global $pagenow;


@@ -302,4 +306,3 @@ function wp_link_manager_disabled_message() {
 
        wp_die( __( 'You do not have sufficient permissions to edit the links for this site.' ) );
 }
 
        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' );