link-manager.diff on Ticket #21307 – Attachment – WordPress Trac

wp-includes/admin-bar.php

         if ( current_user_can( 'upload_files' ) )
                 $actions[ 'media-new.php' ] = array( _x( 'Media', 'add new from admin bar' ), 'new-media' );
-        if ( current_user_can( 'manage_links' ) )
-                $actions[ 'link-add.php' ] = array( _x( 'Link', 'add new from admin bar' ), 'new-link' );
         if ( isset( $cpts['page'] ) && current_user_can( $cpts['page']->cap->edit_posts ) ) {
                 $actions[ 'post-new.php?post_type=page' ] = array( $cpts['page']->labels->name_admin_bar, 'new-page' );
                 unset( $cpts['page'] );

wp-includes/category.php

         $args = wp_parse_args( $args, $defaults );
         $taxonomy = apply_filters( 'get_categories_taxonomy', $args['taxonomy'], $args );
+        // Back compat
+        if ( isset($args['type']) && 'link' == $args['type'] ) {
+                _deprecated_argument( __FUNCTION__, '3.0', '' );
+                $taxonomy = $args['taxonomy'] = 'link_category';
+        }
+        $args['taxonomy'] = $taxonomy;
         $categories = (array) get_terms( $taxonomy, $args );
         foreach ( array_keys( $categories ) as $k )

wp-includes/taxonomy.php

                 'show_in_nav_menus' => false,
         ) );
-        register_taxonomy( 'link_category', 'link', array(
-                'hierarchical' => false,
-                'labels' => array(
-                        'name' => __( 'Link Categories' ),
-                        'singular_name' => __( 'Link Category' ),
-                        'search_items' => __( 'Search Link Categories' ),
-                        'popular_items' => null,
-                        'all_items' => __( 'All Link Categories' ),
-                        'edit_item' => __( 'Edit Link Category' ),
-                        'update_item' => __( 'Update Link Category' ),
-                        'add_new_item' => __( 'Add New Link Category' ),
-                        'new_item_name' => __( 'New Link Category Name' ),
-                        'separate_items_with_commas' => null,
-                        'add_or_remove_items' => null,
-                        'choose_from_most_used' => null,
-                ),
-                'query_var' => false,
-                'rewrite' => false,
-                'public' => false,
-                'show_ui' => false,
-                '_builtin' => true,
-        ) );
         register_taxonomy( 'post_format', 'post', array(
                 'public' => true,
                 'hierarchical' => false,
 …
 /**
  * Will update term count based on number of objects.
+ *
- * Default callback for the link_category taxonomy.
+ *
  * @package WordPress
  * @subpackage Taxonomy

wp-includes/default-widgets.php

+}
 /**
- * Links widget class
+ *
- * @since 2.8.0
- */
-class WP_Widget_Links extends WP_Widget {
-        function __construct() {
-                $widget_ops = array('description' => __( "Your blogroll" ) );
-                parent::__construct('links', __('Links'), $widget_ops);
+        }
-        function widget( $args, $instance ) {
-                extract($args, EXTR_SKIP);
-                $show_description = isset($instance['description']) ? $instance['description'] : false;
-                $show_name = isset($instance['name']) ? $instance['name'] : false;
-                $show_rating = isset($instance['rating']) ? $instance['rating'] : false;
-                $show_images = isset($instance['images']) ? $instance['images'] : true;
-                $category = isset($instance['category']) ? $instance['category'] : false;
-                $orderby = isset( $instance['orderby'] ) ? $instance['orderby'] : 'name';
-                $order = $orderby == 'rating' ? 'DESC' : 'ASC';
-                $limit = isset( $instance['limit'] ) ? $instance['limit'] : -1;
-                $before_widget = preg_replace('/id="[^"]*"/','id="%id"', $before_widget);
-                wp_list_bookmarks(apply_filters('widget_links_args', array(
-                        'title_before' => $before_title, 'title_after' => $after_title,
-                        'category_before' => $before_widget, 'category_after' => $after_widget,
-                        'show_images' => $show_images, 'show_description' => $show_description,
-                        'show_name' => $show_name, 'show_rating' => $show_rating,
-                        'category' => $category, 'class' => 'linkcat widget',
-                        'orderby' => $orderby, 'order' => $order,
-                        'limit' => $limit,
-                )));
+        }
-        function update( $new_instance, $old_instance ) {
-                $new_instance = (array) $new_instance;
-                $instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0 );
-                foreach ( $instance as $field => $val ) {
-                        if ( isset($new_instance[$field]) )
-                                $instance[$field] = 1;
+                }
-                $instance['orderby'] = 'name';
-                if ( in_array( $new_instance['orderby'], array( 'name', 'rating', 'id', 'rand' ) ) )
-                        $instance['orderby'] = $new_instance['orderby'];
-                $instance['category'] = intval( $new_instance['category'] );
-                $instance['limit'] = ! empty( $new_instance['limit'] ) ? intval( $new_instance['limit'] ) : -1;
-                return $instance;
+        }
-        function form( $instance ) {
-                //Defaults
-                $instance = wp_parse_args( (array) $instance, array( 'images' => true, 'name' => true, 'description' => false, 'rating' => false, 'category' => false, 'orderby' => 'name', 'limit' => -1 ) );
-                $link_cats = get_terms( 'link_category' );
-                if ( ! $limit = intval( $instance['limit'] ) )
-                        $limit = -1;
-?>
-                <p>
-                <label for="<?php echo $this->get_field_id('category'); ?>"><?php _e( 'Select Link Category:' ); ?></label>
-                <select class="widefat" id="<?php echo $this->get_field_id('category'); ?>" name="<?php echo $this->get_field_name('category'); ?>">
-                <option value=""><?php _ex('All Links', 'links widget'); ?></option>
-                <?php
-                foreach ( $link_cats as $link_cat ) {
-                        echo '<option value="' . intval($link_cat->term_id) . '"'
-                                . ( $link_cat->term_id == $instance['category'] ? ' selected="selected"' : '' )
-                                . '>' . $link_cat->name . "</option>\n";
+                }
-                ?>
-                </select>
-                <label for="<?php echo $this->get_field_id('orderby'); ?>"><?php _e( 'Sort by:' ); ?></label>
-                <select name="<?php echo $this->get_field_name('orderby'); ?>" id="<?php echo $this->get_field_id('orderby'); ?>" class="widefat">
-                        <option value="name"<?php selected( $instance['orderby'], 'name' ); ?>><?php _e( 'Link title' ); ?></option>
-                        <option value="rating"<?php selected( $instance['orderby'], 'rating' ); ?>><?php _e( 'Link rating' ); ?></option>
-                        <option value="id"<?php selected( $instance['orderby'], 'id' ); ?>><?php _e( 'Link ID' ); ?></option>
-                        <option value="rand"<?php selected( $instance['orderby'], 'rand' ); ?>><?php _e( 'Random' ); ?></option>
-                </select>
-                </p>
-                <p>
-                <input class="checkbox" type="checkbox" <?php checked($instance['images'], true) ?> id="<?php echo $this->get_field_id('images'); ?>" name="<?php echo $this->get_field_name('images'); ?>" />
-                <label for="<?php echo $this->get_field_id('images'); ?>"><?php _e('Show Link Image'); ?></label><br />
-                <input class="checkbox" type="checkbox" <?php checked($instance['name'], true) ?> id="<?php echo $this->get_field_id('name'); ?>" name="<?php echo $this->get_field_name('name'); ?>" />
-                <label for="<?php echo $this->get_field_id('name'); ?>"><?php _e('Show Link Name'); ?></label><br />
-                <input class="checkbox" type="checkbox" <?php checked($instance['description'], true) ?> id="<?php echo $this->get_field_id('description'); ?>" name="<?php echo $this->get_field_name('description'); ?>" />
-                <label for="<?php echo $this->get_field_id('description'); ?>"><?php _e('Show Link Description'); ?></label><br />
-                <input class="checkbox" type="checkbox" <?php checked($instance['rating'], true) ?> id="<?php echo $this->get_field_id('rating'); ?>" name="<?php echo $this->get_field_name('rating'); ?>" />
-                <label for="<?php echo $this->get_field_id('rating'); ?>"><?php _e('Show Link Rating'); ?></label>
-                </p>
-                <p>
-                <label for="<?php echo $this->get_field_id('limit'); ?>"><?php _e( 'Number of links to show:' ); ?></label>
-                <input id="<?php echo $this->get_field_id('limit'); ?>" name="<?php echo $this->get_field_name('limit'); ?>" type="text" value="<?php echo $limit == -1 ? '' : intval( $limit ); ?>" size="3" />
-                </p>
-<?php
+        }
+}
-/**
  * Search widget class
+ *
  * @since 2.8.0
 …
         register_widget('WP_Widget_Archives');
-        register_widget('WP_Widget_Links');
         register_widget('WP_Widget_Meta');
         register_widget('WP_Widget_Search');

wp-includes/bookmark-template.php

-<?php
-/**
- * Bookmark Template Functions for usage in Themes
+ *
- * @package WordPress
- * @subpackage Template
- */
-/**
- * The formatted output of a list of bookmarks.
+ *
- * The $bookmarks array must contain bookmark objects and will be iterated over
- * to retrieve the bookmark to be used in the output.
+ *
- * The output is formatted as HTML with no way to change that format. However,
- * what is between, before, and after can be changed. The link itself will be
- * HTML.
+ *
- * This function is used internally by wp_list_bookmarks() and should not be
- * used by themes.
+ *
- * The defaults for overwriting are:
- * 'show_updated' - Default is 0 (integer). Will show the time of when the
- *              bookmark was last updated.
- * 'show_description' - Default is 0 (integer). Whether to show the description
- *              of the bookmark.
- * 'show_images' - Default is 1 (integer). Whether to show link image if
- *              available.
- * 'show_name' - Default is 0 (integer). Whether to show link name if
- *              available.
- * 'before' - Default is '<li>' (string). The html or text to prepend to each
- *              bookmarks.
- * 'after' - Default is '</li>' (string). The html or text to append to each
- *              bookmarks.
- * 'link_before' - Default is '' (string). The html or text to prepend to each
- *              bookmarks inside the <a> tag.
- * 'link_after' - Default is '' (string). The html or text to append to each
- *              bookmarks inside the <a> tag.
- * 'between' - Default is '\n' (string). The string for use in between the link,
- *              description, and image.
- * 'show_rating' - Default is 0 (integer). Whether to show the link rating.
+ *
- * @since 2.1.0
- * @access private
+ *
- * @param array $bookmarks List of bookmarks to traverse
- * @param string|array $args Optional. Overwrite the defaults.
- * @return string Formatted output in HTML
- */
-function _walk_bookmarks($bookmarks, $args = '' ) {
-        $defaults = array(
-                'show_updated' => 0, 'show_description' => 0,
-                'show_images' => 1, 'show_name' => 0,
-                'before' => '<li>', 'after' => '</li>', 'between' => "\n",
-                'show_rating' => 0, 'link_before' => '', 'link_after' => ''
-        );
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
-        $output = ''; // Blank string to start with.
-        foreach ( (array) $bookmarks as $bookmark ) {
-                if ( !isset($bookmark->recently_updated) )
-                        $bookmark->recently_updated = false;
-                $output .= $before;
-                if ( $show_updated && $bookmark->recently_updated )
-                        $output .= get_option('links_recently_updated_prepend');
-                $the_link = '#';
-                if ( !empty($bookmark->link_url) )
-                        $the_link = esc_url($bookmark->link_url);
-                $desc = esc_attr(sanitize_bookmark_field('link_description', $bookmark->link_description, $bookmark->link_id, 'display'));
-                $name = esc_attr(sanitize_bookmark_field('link_name', $bookmark->link_name, $bookmark->link_id, 'display'));
-                $title = $desc;
-                if ( $show_updated )
-                        if ( '00' != substr($bookmark->link_updated_f, 0, 2) ) {
-                                $title .= ' (';
-                                $title .= sprintf(__('Last updated: %s'), date(get_option('links_updated_date_format'), $bookmark->link_updated_f + (get_option('gmt_offset') * 3600)));
-                                $title .= ')';
+                        }
-                $alt = ' alt="' . $name . ( $show_description ? ' ' . $title : '' ) . '"';
-                if ( '' != $title )
-                        $title = ' title="' . $title . '"';
-                $rel = $bookmark->link_rel;
-                if ( '' != $rel )
-                        $rel = ' rel="' . esc_attr($rel) . '"';
-                $target = $bookmark->link_target;
-                if ( '' != $target )
-                        $target = ' target="' . $target . '"';
-                $output .= '<a href="' . $the_link . '"' . $rel . $title . $target . '>';
-                $output .= $link_before;
-                if ( $bookmark->link_image != null && $show_images ) {
-                        if ( strpos($bookmark->link_image, 'http') === 0 )
-                                $output .= "<img src=\"$bookmark->link_image\" $alt $title />";
-                        else // If it's a relative path
-                                $output .= "<img src=\"" . get_option('siteurl') . "$bookmark->link_image\" $alt $title />";
-                        if ( $show_name )
-                                $output .= " $name";
-                } else {
-                        $output .= $name;
+                }
-                $output .= $link_after;
-                $output .= '</a>';
-                if ( $show_updated && $bookmark->recently_updated )
-                        $output .= get_option('links_recently_updated_append');
-                if ( $show_description && '' != $desc )
-                        $output .= $between . $desc;
-                if ( $show_rating )
-                        $output .= $between . sanitize_bookmark_field('link_rating', $bookmark->link_rating, $bookmark->link_id, 'display');
-                $output .= "$after\n";
-        } // end while
-        return $output;
+}
-/**
- * Retrieve or echo all of the bookmarks.
+ *
- * List of default arguments are as follows:
- * 'orderby' - Default is 'name' (string). How to order the links by. String is
- *              based off of the bookmark scheme.
- * 'order' - Default is 'ASC' (string). Either 'ASC' or 'DESC'. Orders in either
- *              ascending or descending order.
- * 'limit' - Default is -1 (integer) or show all. The amount of bookmarks to
- *              display.
- * 'category' - Default is empty string (string). Include the links in what
- *              category ID(s).
- * 'category_name' - Default is empty string (string). Get links by category
- *              name.
- * 'hide_invisible' - Default is 1 (integer). Whether to show (default) or hide
- *              links marked as 'invisible'.
- * 'show_updated' - Default is 0 (integer). Will show the time of when the
- *              bookmark was last updated.
- * 'echo' - Default is 1 (integer). Whether to echo (default) or return the
- *              formatted bookmarks.
- * 'categorize' - Default is 1 (integer). Whether to show links listed by
- *              category (default) or show links in one column.
- * 'show_description' - Default is 0 (integer). Whether to show the description
- *              of the bookmark.
+ *
- * These options define how the Category name will appear before the category
- * links are displayed, if 'categorize' is 1. If 'categorize' is 0, then it will
- * display for only the 'title_li' string and only if 'title_li' is not empty.
- * 'title_li' - Default is 'Bookmarks' (translatable string). What to show
- *              before the links appear.
- * 'title_before' - Default is '<h2>' (string). The HTML or text to show before
- *              the 'title_li' string.
- * 'title_after' - Default is '</h2>' (string). The HTML or text to show after
- *              the 'title_li' string.
- * 'class' - Default is 'linkcat' (string). The CSS class to use for the
- *              'title_li'.
+ *
- * 'category_before' - Default is '<li id="%id" class="%class">'. String must
- *              contain '%id' and '%class' to get
- * the id of the category and the 'class' argument. These are used for
- *              formatting in themes.
- * Argument will be displayed before the 'title_before' argument.
- * 'category_after' - Default is '</li>' (string). The HTML or text that will
- *              appear after the list of links.
+ *
- * These are only used if 'categorize' is set to 1 or true.
- * 'category_orderby' - Default is 'name'. How to order the bookmark category
- *              based on term scheme.
- * 'category_order' - Default is 'ASC'. Set the order by either ASC (ascending)
- *              or DESC (descending).
+ *
- * @see _walk_bookmarks() For other arguments that can be set in this function
- *              and passed to _walk_bookmarks().
- * @see get_bookmarks() For other arguments that can be set in this function and
- *              passed to get_bookmarks().
- * @link http://codex.wordpress.org/Template_Tags/wp_list_bookmarks
+ *
- * @since 2.1.0
- * @uses _walk_bookmarks() Used to iterate over all of the bookmarks and return
- *              the html
- * @uses get_terms() Gets all of the categories that are for links.
+ *
- * @param string|array $args Optional. Overwrite the defaults of the function
- * @return string|null Will only return if echo option is set to not echo.
- *              Default is not return anything.
- */
-function wp_list_bookmarks($args = '') {
-        $defaults = array(
-                'orderby' => 'name', 'order' => 'ASC',
-                'limit' => -1, 'category' => '', 'exclude_category' => '',
-                'category_name' => '', 'hide_invisible' => 1,
-                'show_updated' => 0, 'echo' => 1,
-                'categorize' => 1, 'title_li' => __('Bookmarks'),
-                'title_before' => '<h2>', 'title_after' => '</h2>',
-                'category_orderby' => 'name', 'category_order' => 'ASC',
-                'class' => 'linkcat', 'category_before' => '<li id="%id" class="%class">',
-                'category_after' => '</li>'
-        );
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
-        $output = '';
-        if ( $categorize ) {
-                //Split the bookmarks into ul's for each category
-                $cats = get_terms('link_category', array('name__like' => $category_name, 'include' => $category, 'exclude' => $exclude_category, 'orderby' => $category_orderby, 'order' => $category_order, 'hierarchical' => 0));
-                foreach ( (array) $cats as $cat ) {
-                        $params = array_merge($r, array('category'=>$cat->term_id));
-                        $bookmarks = get_bookmarks($params);
-                        if ( empty($bookmarks) )
-                                continue;
-                        $output .= str_replace(array('%id', '%class'), array("linkcat-$cat->term_id", $class), $category_before);
-                        $catname = apply_filters( "link_category", $cat->name );
-                        $output .= "$title_before$catname$title_after\n\t<ul class='xoxo blogroll'>\n";
-                        $output .= _walk_bookmarks($bookmarks, $r);
-                        $output .= "\n\t</ul>\n$category_after\n";
+                }
-        } else {
-                //output one single list using title_li for the title
-                $bookmarks = get_bookmarks($r);
-                if ( !empty($bookmarks) ) {
-                        if ( !empty( $title_li ) ){
-                                $output .= str_replace(array('%id', '%class'), array("linkcat-$category", $class), $category_before);
-                                $output .= "$title_before$title_li$title_after\n\t<ul class='xoxo blogroll'>\n";
-                                $output .= _walk_bookmarks($bookmarks, $r);
-                                $output .= "\n\t</ul>\n$category_after\n";
-                        } else {
-                                $output .= _walk_bookmarks($bookmarks, $r);
+                        }
+                }
+        }
-        $output = apply_filters( 'wp_list_bookmarks', $output );
-        if ( !$echo )
-                return $output;
-        echo $output;
+}

wp-includes/bookmark.php

-<?php
-/**
- * Link/Bookmark API
+ *
- * @package WordPress
- * @subpackage Bookmark
- */
-/**
- * Retrieve Bookmark data
+ *
- * @since 2.1.0
- * @uses $wpdb Database Object
+ *
- * @param mixed $bookmark
- * @param string $output Optional. Either OBJECT, ARRAY_N, or ARRAY_A constant
- * @param string $filter Optional, default is 'raw'.
- * @return array|object Type returned depends on $output value.
- */
-function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') {
-        global $wpdb;
-        if ( empty($bookmark) ) {
-                if ( isset($GLOBALS['link']) )
-                        $_bookmark = & $GLOBALS['link'];
-                else
-                        $_bookmark = null;
-        } elseif ( is_object($bookmark) ) {
-                wp_cache_add($bookmark->link_id, $bookmark, 'bookmark');
-                $_bookmark = $bookmark;
-        } else {
-                if ( isset($GLOBALS['link']) && ($GLOBALS['link']->link_id == $bookmark) ) {
-                        $_bookmark = & $GLOBALS['link'];
-                } elseif ( ! $_bookmark = wp_cache_get($bookmark, 'bookmark') ) {
-                        $_bookmark = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->links WHERE link_id = %d LIMIT 1", $bookmark));
-                        $_bookmark->link_category = array_unique( wp_get_object_terms($_bookmark->link_id, 'link_category', array('fields' => 'ids')) );
-                        wp_cache_add($_bookmark->link_id, $_bookmark, 'bookmark');
+                }
+        }
-        $_bookmark = sanitize_bookmark($_bookmark, $filter);
-        if ( $output == OBJECT ) {
-                return $_bookmark;
-        } elseif ( $output == ARRAY_A ) {
-                return get_object_vars($_bookmark);
-        } elseif ( $output == ARRAY_N ) {
-                return array_values(get_object_vars($_bookmark));
-        } else {
-                return $_bookmark;
+        }
+}
-/**
- * Retrieve single bookmark data item or field.
+ *
- * @since 2.3.0
- * @uses get_bookmark() Gets bookmark object using $bookmark as ID
- * @uses sanitize_bookmark_field() Sanitizes Bookmark field based on $context.
+ *
- * @param string $field The name of the data field to return
- * @param int $bookmark The bookmark ID to get field
- * @param string $context Optional. The context of how the field will be used.
- * @return string
- */
-function get_bookmark_field( $field, $bookmark, $context = 'display' ) {
-        $bookmark = (int) $bookmark;
-        $bookmark = get_bookmark( $bookmark );
-        if ( is_wp_error($bookmark) )
-                return $bookmark;
-        if ( !is_object($bookmark) )
-                return '';
-        if ( !isset($bookmark->$field) )
-                return '';
-        return sanitize_bookmark_field($field, $bookmark->$field, $bookmark->link_id, $context);
+}
-/**
- * Retrieves the list of bookmarks
+ *
- * Attempts to retrieve from the cache first based on MD5 hash of arguments. If
- * that fails, then the query will be built from the arguments and executed. The
- * results will be stored to the cache.
+ *
- * List of default arguments are as follows:
- * 'orderby' - Default is 'name' (string). How to order the links by. String is
- *              based off of the bookmark scheme.
- * 'order' - Default is 'ASC' (string). Either 'ASC' or 'DESC'. Orders in either
- *              ascending or descending order.
- * 'limit' - Default is -1 (integer) or show all. The amount of bookmarks to
- *              display.
- * 'category' - Default is empty string (string). Include the links in what
- *              category ID(s).
- * 'category_name' - Default is empty string (string). Get links by category
- *              name.
- * 'hide_invisible' - Default is 1 (integer). Whether to show (default) or hide
- *              links marked as 'invisible'.
- * 'show_updated' - Default is 0 (integer). Will show the time of when the
- *              bookmark was last updated.
- * 'include' - Default is empty string (string). Include bookmark ID(s)
- *              separated by commas.
- * 'exclude' - Default is empty string (string). Exclude bookmark ID(s)
- *              separated by commas.
+ *
- * @since 2.1.0
- * @uses $wpdb Database Object
- * @link http://codex.wordpress.org/Template_Tags/get_bookmarks
+ *
- * @param string|array $args List of arguments to overwrite the defaults
- * @return array List of bookmark row objects
- */
-function get_bookmarks($args = '') {
-        global $wpdb;
-        $defaults = array(
-                'orderby' => 'name', 'order' => 'ASC',
-                'limit' => -1, 'category' => '',
-                'category_name' => '', 'hide_invisible' => 1,
-                'show_updated' => 0, 'include' => '',
-                'exclude' => '', 'search' => ''
-        );
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
-        $cache = array();
-        $key = md5( serialize( $r ) );
-        if ( $cache = wp_cache_get( 'get_bookmarks', 'bookmark' ) ) {
-                if ( is_array($cache) && isset( $cache[ $key ] ) )
-                        return apply_filters('get_bookmarks', $cache[ $key ], $r );
+        }
-        if ( !is_array($cache) )
-                $cache = array();
-        $inclusions = '';
-        if ( !empty($include) ) {
-                $exclude = '';  //ignore exclude, category, and category_name params if using include
-                $category = '';
-                $category_name = '';
-                $inclinks = preg_split('/[\s,]+/',$include);
-                if ( count($inclinks) ) {
-                        foreach ( $inclinks as $inclink ) {
-                                if (empty($inclusions))
-                                        $inclusions = ' AND ( link_id = ' . intval($inclink) . ' ';
-                                else
-                                        $inclusions .= ' OR link_id = ' . intval($inclink) . ' ';
+                        }
+                }
+        }
-        if (!empty($inclusions))
-                $inclusions .= ')';
-        $exclusions = '';
-        if ( !empty($exclude) ) {
-                $exlinks = preg_split('/[\s,]+/',$exclude);
-                if ( count($exlinks) ) {
-                        foreach ( $exlinks as $exlink ) {
-                                if (empty($exclusions))
-                                        $exclusions = ' AND ( link_id <> ' . intval($exlink) . ' ';
-                                else
-                                        $exclusions .= ' AND link_id <> ' . intval($exlink) . ' ';
+                        }
+                }
+        }
-        if (!empty($exclusions))
-                $exclusions .= ')';
-        if ( !empty($category_name) ) {
-                if ( $category = get_term_by('name', $category_name, 'link_category') ) {
-                        $category = $category->term_id;
-                } else {
-                        $cache[ $key ] = array();
-                        wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
-                        return apply_filters( 'get_bookmarks', array(), $r );
+                }
+        }
-        if ( ! empty($search) ) {
-                $search = like_escape($search);
-                $search = " AND ( (link_url LIKE '%$search%') OR (link_name LIKE '%$search%') OR (link_description LIKE '%$search%') ) ";
+        }
-        $category_query = '';
-        $join = '';
-        if ( !empty($category) ) {
-                $incategories = preg_split('/[\s,]+/',$category);
-                if ( count($incategories) ) {
-                        foreach ( $incategories as $incat ) {
-                                if (empty($category_query))
-                                        $category_query = ' AND ( tt.term_id = ' . intval($incat) . ' ';
-                                else
-                                        $category_query .= ' OR tt.term_id = ' . intval($incat) . ' ';
+                        }
+                }
+        }
-        if (!empty($category_query)) {
-                $category_query .= ") AND taxonomy = 'link_category'";
-                $join = " INNER JOIN $wpdb->term_relationships AS tr ON ($wpdb->links.link_id = tr.object_id) INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_taxonomy_id = tr.term_taxonomy_id";
+        }
-        if ( $show_updated && get_option('links_recently_updated_time') ) {
-                $recently_updated_test = ", IF (DATE_ADD(link_updated, INTERVAL " . get_option('links_recently_updated_time') . " MINUTE) >= NOW(), 1,0) as recently_updated ";
-        } else {
-                $recently_updated_test = '';
+        }
-        $get_updated = ( $show_updated ) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : '';
-        $orderby = strtolower($orderby);
-        $length = '';
-        switch ( $orderby ) {
-                case 'length':
-                        $length = ", CHAR_LENGTH(link_name) AS length";
-                        break;
-                case 'rand':
-                        $orderby = 'rand()';
-                        break;
-                case 'link_id':
-                        $orderby = "$wpdb->links.link_id";
-                        break;
-                default:
-                        $orderparams = array();
-                        foreach ( explode(',', $orderby) as $ordparam ) {
-                                $ordparam = trim($ordparam);
-                                $keys = array( 'link_id', 'link_name', 'link_url', 'link_visible', 'link_rating', 'link_owner', 'link_updated', 'link_notes' );
-                                if ( in_array( 'link_' . $ordparam, $keys ) )
-                                        $orderparams[] = 'link_' . $ordparam;
-                                elseif ( in_array( $ordparam, $keys ) )
-                                        $orderparams[] = $ordparam;
+                        }
-                        $orderby = implode(',', $orderparams);
+        }
-        if ( empty( $orderby ) )
-                $orderby = 'link_name';
-        $order = strtoupper( $order );
-        if ( '' !== $order && !in_array( $order, array( 'ASC', 'DESC' ) ) )
-                $order = 'ASC';
-        $visible = '';
-        if ( $hide_invisible )
-                $visible = "AND link_visible = 'Y'";
-        $query = "SELECT * $length $recently_updated_test $get_updated FROM $wpdb->links $join WHERE 1=1 $visible $category_query";
-        $query .= " $exclusions $inclusions $search";
-        $query .= " ORDER BY $orderby $order";
-        if ($limit != -1)
-                $query .= " LIMIT $limit";
-        $results = $wpdb->get_results($query);
-        $cache[ $key ] = $results;
-        wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
-        return apply_filters('get_bookmarks', $results, $r);
+}
-/**
- * Sanitizes all bookmark fields
+ *
- * @since 2.3.0
+ *
- * @param object|array $bookmark Bookmark row
- * @param string $context Optional, default is 'display'. How to filter the
- *              fields
- * @return object|array Same type as $bookmark but with fields sanitized.
- */
-function sanitize_bookmark($bookmark, $context = 'display') {
-        $fields = array('link_id', 'link_url', 'link_name', 'link_image', 'link_target', 'link_category',
-                'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_updated',
-                'link_rel', 'link_notes', 'link_rss', );
-        if ( is_object($bookmark) ) {
-                $do_object = true;
-                $link_id = $bookmark->link_id;
-        } else {
-                $do_object = false;
-                $link_id = $bookmark['link_id'];
+        }
-        foreach ( $fields as $field ) {
-                if ( $do_object ) {
-                        if ( isset($bookmark->$field) )
-                                $bookmark->$field = sanitize_bookmark_field($field, $bookmark->$field, $link_id, $context);
-                } else {
-                        if ( isset($bookmark[$field]) )
-                                $bookmark[$field] = sanitize_bookmark_field($field, $bookmark[$field], $link_id, $context);
+                }
+        }
-        return $bookmark;
+}
-/**
- * Sanitizes a bookmark field
+ *
- * Sanitizes the bookmark fields based on what the field name is. If the field
- * has a strict value set, then it will be tested for that, else a more generic
- * filtering is applied. After the more strict filter is applied, if the
- * $context is 'raw' then the value is immediately return.
+ *
- * Hooks exist for the more generic cases. With the 'edit' context, the
- * 'edit_$field' filter will be called and passed the $value and $bookmark_id
- * respectively. With the 'db' context, the 'pre_$field' filter is called and
- * passed the value. The 'display' context is the final context and has the
- * $field has the filter name and is passed the $value, $bookmark_id, and
- * $context respectively.
+ *
- * @since 2.3.0
+ *
- * @param string $field The bookmark field
- * @param mixed $value The bookmark field value
- * @param int $bookmark_id Bookmark ID
- * @param string $context How to filter the field value. Either 'raw', 'edit',
- *              'attribute', 'js', 'db', or 'display'
- * @return mixed The filtered value
- */
-function sanitize_bookmark_field($field, $value, $bookmark_id, $context) {
-        switch ( $field ) {
-        case 'link_id' : // ints
-        case 'link_rating' :
-                $value = (int) $value;
-                break;
-        case 'link_category' : // array( ints )
-                $value = array_map('absint', (array) $value);
-                // We return here so that the categories aren't filtered.
-                // The 'link_category' filter is for the name of a link category, not an array of a link's link categories
-                return $value;
-                break;
-        case 'link_visible' : // bool stored as Y|N
-                $value = preg_replace('/[^YNyn]/', '', $value);
-                break;
-        case 'link_target' : // "enum"
-                $targets = array('_top', '_blank');
-                if ( ! in_array($value, $targets) )
-                        $value = '';
-                break;
+        }
-        if ( 'raw' == $context )
-                return $value;
-        if ( 'edit' == $context ) {
-                $value = apply_filters("edit_$field", $value, $bookmark_id);
-                if ( 'link_notes' == $field ) {
-                        $value = esc_html( $value ); // textarea_escaped
-                } else {
-                        $value = esc_attr($value);
+                }
-        } else if ( 'db' == $context ) {
-                $value = apply_filters("pre_$field", $value);
-        } else {
-                // Use display filters by default.
-                $value = apply_filters($field, $value, $bookmark_id, $context);
-                if ( 'attribute' == $context )
-                        $value = esc_attr($value);
-                else if ( 'js' == $context )
-                        $value = esc_js($value);
+        }
-        return $value;
+}
-/**
- * Deletes bookmark cache
+ *
- * @since 2.7.0
- * @uses wp_cache_delete() Deletes the contents of 'get_bookmarks'
- */
-function clean_bookmark_cache( $bookmark_id ) {
-        wp_cache_delete( $bookmark_id, 'bookmark' );
-        wp_cache_delete( 'get_bookmarks', 'bookmark' );
-        clean_object_term_cache( $bookmark_id, 'link');
+}

wp-includes/link-template.php

         echo $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID ) . $after;
+}
-/**
- * Display edit bookmark (literally a URL external to blog) link.
+ *
- * @since 2.7.0
+ *
- * @param int $link Optional. Bookmark ID.
- * @return string
- */
-function get_edit_bookmark_link( $link = 0 ) {
-        $link = get_bookmark( $link );
-        if ( !current_user_can('manage_links') )
-                return;
-        $location = admin_url('link.php?action=edit&amp;link_id=') . $link->link_id;
-        return apply_filters( 'get_edit_bookmark_link', $location, $link->link_id );
+}
-/**
- * Display edit bookmark (literally a URL external to blog) link anchor content.
+ *
- * @since 2.7.0
+ *
- * @param string $link Optional. Anchor text.
- * @param string $before Optional. Display before edit link.
- * @param string $after Optional. Display after edit link.
- * @param int $bookmark Optional. Bookmark ID.
- */
-function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark = null ) {
-        $bookmark = get_bookmark($bookmark);
-        if ( !current_user_can('manage_links') )
-                return;
-        if ( empty($link) )
-                $link = __('Edit This');
-        $link = '<a href="' . get_edit_bookmark_link( $bookmark ) . '" title="' . esc_attr__( 'Edit Link' ) . '">' . $link . '</a>';
-        echo $before . apply_filters( 'edit_bookmark_link', $link, $bookmark->link_id ) . $after;
+}
 // Navigation links
 /**

wp-includes/formatting.php

                 case 'rss_excerpt_length':
                 case 'default_category':
                 case 'default_email_category':
-                case 'default_link_category':
                 case 'close_comments_days_old':
                 case 'comments_per_page':
                 case 'thread_comments_depth':

wp-includes/deprecated.php

+}
 /**
- * Gets the links associated with category $cat_name.
+ *
- * @since 0.71
- * @deprecated 2.1
- * @deprecated Use get_bookmarks()
- * @see get_bookmarks()
+ *
- * @param string $cat_name Optional. The category name to use. If no match is found uses all.
- * @param string $before Optional. The html to output before the link.
- * @param string $after Optional. The html to output after the link.
- * @param string $between Optional. The html to output between the link/image and it's description. Not used if no image or $show_images is true.
- * @param bool $show_images Optional. Whether to show images (if defined).
- * @param string $orderby Optional. The order to output the links. E.g. 'id', 'name', 'url', 'description' or 'rating'. Or maybe owner.
- *              If you start the name with an underscore the order will be reversed. You can also specify 'rand' as the order which will return links in a
- *              random order.
- * @param bool $show_description Optional. Whether to show the description if show_images=false/not defined.
- * @param bool $show_rating Optional. Show rating stars/chars.
- * @param int $limit            Optional. Limit to X entries. If not specified, all entries are shown.
- * @param int $show_updated Optional. Whether to show last updated timestamp
- */
-function get_linksbyname($cat_name = "noname", $before = '', $after = '<br />', $between = " ", $show_images = true, $orderby = 'id',
-                                                 $show_description = true, $show_rating = false,
-                                                 $limit = -1, $show_updated = 0) {
-        _deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
-        $cat_id = -1;
-        $cat = get_term_by('name', $cat_name, 'link_category');
-        if ( $cat )
-                $cat_id = $cat->term_id;
-        get_links($cat_id, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated);
+}
-/**
- * Gets the links associated with the named category.
+ *
- * @since 1.0.1
- * @deprecated 2.1
- * @deprecated Use wp_list_bookmarks()
- * @see wp_list_bookmarks()
+ *
- * @param string $category The category to use.
- * @param string $args
- * @return bool|null
- */
-function wp_get_linksbyname($category, $args = '') {
-        _deprecated_function(__FUNCTION__, '2.1', 'wp_list_bookmarks()');
-        $defaults = array(
-                'after' => '<br />',
-                'before' => '',
-                'categorize' => 0,
-                'category_after' => '',
-                'category_before' => '',
-                'category_name' => $category,
-                'show_description' => 1,
-                'title_li' => '',
-        );
-        $r = wp_parse_args( $args, $defaults );
-        return wp_list_bookmarks($r);
+}
-/**
- * Gets an array of link objects associated with category $cat_name.
+ *
- * <code>
- *      $links = get_linkobjectsbyname('fred');
- *      foreach ($links as $link) {
- *              echo '<li>'.$link->link_name.'</li>';
- *      }
- * </code>
+ *
- * @since 1.0.1
- * @deprecated 2.1
- * @deprecated Use get_bookmarks()
- * @see get_bookmarks()
+ *
- * @param string $cat_name The category name to use. If no match is found uses all.
- * @param string $orderby The order to output the links. E.g. 'id', 'name', 'url', 'description', or 'rating'.
- *              Or maybe owner. If you start the name with an underscore the order will be reversed. You can also
- *              specify 'rand' as the order which will return links in a random order.
- * @param int $limit Limit to X entries. If not specified, all entries are shown.
- * @return unknown
- */
-function get_linkobjectsbyname($cat_name = "noname" , $orderby = 'name', $limit = -1) {
-        _deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
-        $cat_id = -1;
-        $cat = get_term_by('name', $cat_name, 'link_category');
-        if ( $cat )
-                $cat_id = $cat->term_id;
-        return get_linkobjects($cat_id, $orderby, $limit);
+}
-/**
- * Gets an array of link objects associated with category n.
+ *
- * Usage:
- * <code>
- *      $links = get_linkobjects(1);
- *      if ($links) {
- *              foreach ($links as $link) {
- *                      echo '<li>'.$link->link_name.'<br />'.$link->link_description.'</li>';
- *              }
- *      }
- * </code>
+ *
- * Fields are:
- * <ol>
- *      <li>link_id</li>
- *      <li>link_url</li>
- *      <li>link_name</li>
- *      <li>link_image</li>
- *      <li>link_target</li>
- *      <li>link_category</li>
- *      <li>link_description</li>
- *      <li>link_visible</li>
- *      <li>link_owner</li>
- *      <li>link_rating</li>
- *      <li>link_updated</li>
- *      <li>link_rel</li>
- *      <li>link_notes</li>
- * </ol>
+ *
- * @since 1.0.1
- * @deprecated 2.1
- * @deprecated Use get_bookmarks()
- * @see get_bookmarks()
+ *
- * @param int $category The category to use. If no category supplied uses all
- * @param string $orderby the order to output the links. E.g. 'id', 'name', 'url',
- *              'description', or 'rating'. Or maybe owner. If you start the name with an
- *              underscore the order will be reversed. You can also specify 'rand' as the
- *              order which will return links in a random order.
- * @param int $limit Limit to X entries. If not specified, all entries are shown.
- * @return unknown
- */
-function get_linkobjects($category = 0, $orderby = 'name', $limit = 0) {
-        _deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
-        $links = get_bookmarks( array( 'category' => $category, 'orderby' => $orderby, 'limit' => $limit ) ) ;
-        $links_array = array();
-        foreach ($links as $link)
-                $links_array[] = $link;
-        return $links_array;
+}
-/**
- * Gets the links associated with category 'cat_name' and display rating stars/chars.
+ *
- * @since 0.71
- * @deprecated 2.1
- * @deprecated Use get_bookmarks()
- * @see get_bookmarks()
+ *
- * @param string $cat_name The category name to use. If no match is found uses all
- * @param string $before The html to output before the link
- * @param string $after The html to output after the link
- * @param string $between The html to output between the link/image and it's description. Not used if no image or show_images is true
- * @param bool $show_images Whether to show images (if defined).
- * @param string $orderby the order to output the links. E.g. 'id', 'name', 'url',
- *              'description', or 'rating'. Or maybe owner. If you start the name with an
- *              underscore the order will be reversed. You can also specify 'rand' as the
- *              order which will return links in a random order.
- * @param bool $show_description Whether to show the description if show_images=false/not defined
- * @param int $limit Limit to X entries. If not specified, all entries are shown.
- * @param int $show_updated Whether to show last updated timestamp
- */
-function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = '<br />', $between = " ",
-                                                                        $show_images = true, $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
-        _deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
-        get_linksbyname($cat_name, $before, $after, $between, $show_images, $orderby, $show_description, true, $limit, $show_updated);
+}
-/**
- * Gets the links associated with category n and display rating stars/chars.
+ *
- * @since 0.71
- * @deprecated 2.1
- * @deprecated Use get_bookmarks()
- * @see get_bookmarks()
+ *
- * @param int $category The category to use. If no category supplied uses all
- * @param string $before The html to output before the link
- * @param string $after The html to output after the link
- * @param string $between The html to output between the link/image and it's description. Not used if no image or show_images == true
- * @param bool $show_images Whether to show images (if defined).
- * @param string $orderby The order to output the links. E.g. 'id', 'name', 'url',
- *              'description', or 'rating'. Or maybe owner. If you start the name with an
- *              underscore the order will be reversed. You can also specify 'rand' as the
- *              order which will return links in a random order.
- * @param bool $show_description Whether to show the description if show_images=false/not defined.
- * @param string $limit Limit to X entries. If not specified, all entries are shown.
- * @param int $show_updated Whether to show last updated timestamp
- */
-function get_links_withrating($category = -1, $before = '', $after = '<br />', $between = " ", $show_images = true,
-                                                          $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
-        _deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
-        get_links($category, $before, $after, $between, $show_images, $orderby, $show_description, true, $limit, $show_updated);
+}
-/**
  * Gets the auto_toggle setting.
+ *
  * @since 0.71
 …
+}
 /**
- * Gets the links associated with category.
+ *
- * @see get_links() for argument information that can be used in $args
- * @since 1.0.1
- * @deprecated 2.1
- * @deprecated Use wp_list_bookmarks()
- * @see wp_list_bookmarks()
+ *
- * @param string $args a query string
- * @return null|string
- */
-function wp_get_links($args = '') {
-        _deprecated_function( __FUNCTION__, '2.1', 'wp_list_bookmarks()' );
-        if ( strpos( $args, '=' ) === false ) {
-                $cat_id = $args;
-                $args = add_query_arg( 'category', $cat_id, $args );
+        }
-        $defaults = array(
-                'after' => '<br />',
-                'before' => '',
-                'between' => ' ',
-                'categorize' => 0,
-                'category' => '',
-                'echo' => true,
-                'limit' => -1,
-                'orderby' => 'name',
-                'show_description' => true,
-                'show_images' => true,
-                'show_rating' => false,
-                'show_updated' => true,
-                'title_li' => '',
-        );
-        $r = wp_parse_args( $args, $defaults );
-        return wp_list_bookmarks($r);
+}
-/**
- * Gets the links associated with category by id.
+ *
- * @since 0.71
- * @deprecated 2.1
- * @deprecated Use get_bookmarks()
- * @see get_bookmarks()
+ *
- * @param int $category The category to use. If no category supplied uses all
- * @param string $before the html to output before the link
- * @param string $after the html to output after the link
- * @param string $between the html to output between the link/image and its description.
- *              Not used if no image or show_images == true
- * @param bool $show_images whether to show images (if defined).
- * @param string $orderby the order to output the links. E.g. 'id', 'name', 'url',
- *              'description', or 'rating'. Or maybe owner. If you start the name with an
- *              underscore the order will be reversed. You can also specify 'rand' as the order
- *              which will return links in a random order.
- * @param bool $show_description whether to show the description if show_images=false/not defined.
- * @param bool $show_rating show rating stars/chars
- * @param int $limit Limit to X entries. If not specified, all entries are shown.
- * @param int $show_updated whether to show last updated timestamp
- * @param bool $echo whether to echo the results, or return them instead
- * @return null|string
- */
-function get_links($category = -1, $before = '', $after = '<br />', $between = ' ', $show_images = true, $orderby = 'name',
-                        $show_description = true, $show_rating = false, $limit = -1, $show_updated = 1, $echo = true) {
-        _deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
-        $order = 'ASC';
-        if ( substr($orderby, 0, 1) == '_' ) {
-                $order = 'DESC';
-                $orderby = substr($orderby, 1);
+        }
-        if ( $category == -1 ) //get_bookmarks uses '' to signify all categories
-                $category = '';
-        $results = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'order' => $order, 'show_updated' => $show_updated, 'limit' => $limit));
-        if ( !$results )
-                return;
-        $output = '';
-        foreach ( (array) $results as $row ) {
-                if ( !isset($row->recently_updated) )
-                        $row->recently_updated = false;
-                $output .= $before;
-                if ( $show_updated && $row->recently_updated )
-                        $output .= get_option('links_recently_updated_prepend');
-                $the_link = '#';
-                if ( !empty($row->link_url) )
-                        $the_link = esc_url($row->link_url);
-                $rel = $row->link_rel;
-                if ( '' != $rel )
-                        $rel = ' rel="' . $rel . '"';
-                $desc = esc_attr(sanitize_bookmark_field('link_description', $row->link_description, $row->link_id, 'display'));
-                $name = esc_attr(sanitize_bookmark_field('link_name', $row->link_name, $row->link_id, 'display'));
-                $title = $desc;
-                if ( $show_updated )
-                        if (substr($row->link_updated_f, 0, 2) != '00')
-                                $title .= ' ('.__('Last updated') . ' ' . date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * 3600)) . ')';
-                if ( '' != $title )
-                        $title = ' title="' . $title . '"';
-                $alt = ' alt="' . $name . '"';
-                $target = $row->link_target;
-                if ( '' != $target )
-                        $target = ' target="' . $target . '"';
-                $output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
-                if ( $row->link_image != null && $show_images ) {
-                        if ( strpos($row->link_image, 'http') !== false )
-                                $output .= "<img src=\"$row->link_image\" $alt $title />";
-                        else // If it's a relative path
-                                $output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
-                } else {
-                        $output .= $name;
+                }
-                $output .= '</a>';
-                if ( $show_updated && $row->recently_updated )
-                        $output .= get_option('links_recently_updated_append');
-                if ( $show_description && '' != $desc )
-                        $output .= $between . $desc;
-                if ($show_rating) {
-                        $output .= $between . get_linkrating($row);
+                }
-                $output .= "$after\n";
-        } // end while
-        if ( !$echo )
-                return $output;
-        echo $output;
+}
-/**
- * Output entire list of links by category.
+ *
- * Output a list of all links, listed by category, using the settings in
- * $wpdb->linkcategories and output it as a nested HTML unordered list.
+ *
- * @since 1.0.1
- * @deprecated 2.1
- * @deprecated Use wp_list_bookmarks()
- * @see wp_list_bookmarks()
+ *
- * @param string $order Sort link categories by 'name' or 'id'
- */
-function get_links_list($order = 'name') {
-        _deprecated_function( __FUNCTION__, '2.1', 'wp_list_bookmarks()' );
-        $order = strtolower($order);
-        // Handle link category sorting
-        $direction = 'ASC';
-        if ( '_' == substr($order,0,1) ) {
-                $direction = 'DESC';
-                $order = substr($order,1);
+        }
-        if ( !isset($direction) )
-                $direction = '';
-        $cats = get_categories(array('type' => 'link', 'orderby' => $order, 'order' => $direction, 'hierarchical' => 0));
-        // Display each category
-        if ( $cats ) {
-                foreach ( (array) $cats as $cat ) {
-                        // Handle each category.
-                        // Display the category name
-                        echo '  <li id="linkcat-' . $cat->term_id . '" class="linkcat"><h2>' . apply_filters('link_category', $cat->name ) . "</h2>\n\t<ul>\n";
-                        // Call get_links() with all the appropriate params
-                        get_links($cat->term_id, '<li>', "</li>", "\n", true, 'name', false);
-                        // Close the last category
-                        echo "\n\t</ul>\n</li>\n";
+                }
+        }
+}
-/**
- * Show the link to the links popup and the number of links.
+ *
- * @since 0.71
- * @deprecated 2.1
- * @deprecated {@internal Use function instead is unknown}}
+ *
- * @param string $text the text of the link
- * @param int $width the width of the popup window
- * @param int $height the height of the popup window
- * @param string $file the page to open in the popup window
- * @param bool $count the number of links in the db
- */
-function links_popup_script($text = 'Links', $width=400, $height=400, $file='links.all.php', $count = true) {
-        _deprecated_function( __FUNCTION__, '2.1' );
-        if ( $count )
-                $counts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->links");
-        $javascript = "<a href=\"#\" onclick=\"javascript:window.open('$file?popup=1', '_blank', 'width=$width,height=$height,scrollbars=yes,status=no'); return false\">";
-        $javascript .= $text;
-        if ( $count )
-                $javascript .= " ($counts)";
-        $javascript .= "</a>\n\n";
-                echo $javascript;
+}
-/**
- * @since 1.0.1
- * @deprecated 2.1
- * @deprecated Use sanitize_bookmark_field()
- * @see sanitize_bookmark_field()
+ *
- * @param object $link
- * @return unknown
- */
-function get_linkrating($link) {
-        _deprecated_function( __FUNCTION__, '2.1', 'sanitize_bookmark_field()' );
-        return sanitize_bookmark_field('link_rating', $link->link_rating, $link->link_id, 'display');
+}
-/**
- * Gets the name of category by id.
+ *
- * @since 0.71
- * @deprecated 2.1
- * @deprecated Use get_category()
- * @see get_category()
+ *
- * @param int $id The category to get. If no category supplied uses 0
- * @return string
- */
-function get_linkcatname($id = 0) {
-        _deprecated_function( __FUNCTION__, '2.1', 'get_category()' );
-        $id = (int) $id;
-        if ( empty($id) )
-                return '';
-        $cats = wp_get_link_cats($id);
-        if ( empty($cats) || ! is_array($cats) )
-                return '';
-        $cat_id = (int) $cats[0]; // Take the first cat.
-        $cat = get_category($cat_id);
-        return $cat->name;
+}
-/**
  * Print RSS comment feed link.
+ *
  * @since 1.0.1
 …
+}
 /**
- * Retrieve bookmark data based on ID.
+ *
- * @since 2.0.0
- * @deprecated 2.1.0
- * @deprecated Use get_bookmark()
- * @see get_bookmark()
+ *
- * @param int $bookmark_id ID of link
- * @param string $output OBJECT, ARRAY_N, or ARRAY_A
- * @return object|array
- */
-function get_link($bookmark_id, $output = OBJECT, $filter = 'raw') {
-        _deprecated_function( __FUNCTION__, '2.1', 'get_bookmark()' );
-        return get_bookmark($bookmark_id, $output, $filter);
+}
-/**
  * Performs esc_url() for database or redirect usage.
+ *
  * @since 2.3.1

wp-includes/ms-functions.php

         if ( $reassign != '' ) {
                 $reassign = (int) $reassign;
                 $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_author = %d WHERE post_author = %d", $reassign, $user_id) );
                 $wpdb->query( $wpdb->prepare("UPDATE $wpdb->links SET link_owner = %d WHERE link_owner = %d", $reassign, $user_id) );
+                do_action( 'reassign_user_data', $user_id, $reassign );
+        }
         restore_current_blog();

wp-includes/category-template.php

         $defaults['selected'] = ( is_category() ) ? get_query_var( 'cat' ) : 0;
+        // Back compat.
+        if ( isset( $args['type'] ) && 'link' == $args['type'] ) {
+                _deprecated_argument( __FUNCTION__, '3.0', '' );
+                $args['taxonomy'] = 'link_category';
+        }
+        $args = apply_filters( 'dropdown_categories_args', $args );
         $r = wp_parse_args( $args, $defaults );
         if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) {

wp-content/plugins/link-manager/bookmark-template.php

+<?php
+/**
+ * Bookmark Template Functions for usage in Themes
+ *
+ * @package Link Manager
+ * @subpackage Template
+ */
+/**
+ * The formatted output of a list of bookmarks.
+ *
+ * The $bookmarks array must contain bookmark objects and will be iterated over
+ * to retrieve the bookmark to be used in the output.
+ *
+ * The output is formatted as HTML with no way to change that format. However,
+ * what is between, before, and after can be changed. The link itself will be
+ * HTML.
+ *
+ * This function is used internally by wp_list_bookmarks() and should not be
+ * used by themes.
+ *
+ * The defaults for overwriting are:
+ * 'show_updated' - Default is 0 (integer). Will show the time of when the
+ *              bookmark was last updated.
+ * 'show_description' - Default is 0 (integer). Whether to show the description
+ *              of the bookmark.
+ * 'show_images' - Default is 1 (integer). Whether to show link image if
+ *              available.
+ * 'show_name' - Default is 0 (integer). Whether to show link name if
+ *              available.
+ * 'before' - Default is '<li>' (string). The html or text to prepend to each
+ *              bookmarks.
+ * 'after' - Default is '</li>' (string). The html or text to append to each
+ *              bookmarks.
+ * 'link_before' - Default is '' (string). The html or text to prepend to each
+ *              bookmarks inside the <a> tag.
+ * 'link_after' - Default is '' (string). The html or text to append to each
+ *              bookmarks inside the <a> tag.
+ * 'between' - Default is '\n' (string). The string for use in between the link,
+ *              description, and image.
+ * 'show_rating' - Default is 0 (integer). Whether to show the link rating.
+ *
+ * @since WP 2.1.0
+ * @access private
+ *
+ * @param array $bookmarks List of bookmarks to traverse
+ * @param string|array $args Optional. Overwrite the defaults.
+ * @return string Formatted output in HTML
+ */
+function _walk_bookmarks( $bookmarks, $args = '' ) {
+        $defaults = array(
+                'show_updated' => 0, 'show_description' => 0,
+                'show_images' => 1, 'show_name' => 0,
+                'before' => '<li>', 'after' => '</li>', 'between' => "\n",
+                'show_rating' => 0, 'link_before' => '', 'link_after' => ''
+        );
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+        $output = ''; // Blank string to start with.
+        foreach ( (array) $bookmarks as $bookmark ) {
+                if ( !isset( $bookmark->recently_updated ) )
+                        $bookmark->recently_updated = false;
+                $output .= $before;
+                if ( $show_updated && $bookmark->recently_updated )
+                        $output .= get_option( 'links_recently_updated_prepend' );
+                $the_link = '#';
+                if ( !empty( $bookmark->link_url ) )
+                        $the_link = esc_url( $bookmark->link_url );
+                $desc = esc_attr(sanitize_bookmark_field( 'link_description', $bookmark->link_description, $bookmark->link_id, 'display' ));
+                $name = esc_attr(sanitize_bookmark_field( 'link_name', $bookmark->link_name, $bookmark->link_id, 'display' ));
+                $title = $desc;
+                if ( $show_updated )
+                        if ( '00' != substr( $bookmark->link_updated_f, 0, 2) ) {
+                                $title .= ' ( ';
+                                $title .= sprintf(__( 'Last updated: %s' ), date(get_option( 'links_updated_date_format' ), $bookmark->link_updated_f + (get_option( 'gmt_offset' ) * 3600)));
+                                $title .= ' )';
+                        }
+                $alt = ' alt="' . $name . ( $show_description ? ' ' . $title : '' ) . '"';
+                if ( '' != $title )
+                        $title = ' title="' . $title . '"';
+                $rel = $bookmark->link_rel;
+                if ( '' != $rel )
+                        $rel = ' rel="' . esc_attr( $rel ) . '"';
+                $target = $bookmark->link_target;
+                if ( '' != $target )
+                        $target = ' target="' . $target . '"';
+                $output .= '<a href="' . $the_link . '"' . $rel . $title . $target . '>';
+                $output .= $link_before;
+                if ( $bookmark->link_image != null && $show_images ) {
+                        if ( strpos( $bookmark->link_image, 'http' ) === 0 )
+                                $output .= "<img src=\"$bookmark->link_image\" $alt $title />";
+                        else // If it's a relative path
+                                $output .= "<img src=\"" . get_option( 'siteurl' ) . "$bookmark->link_image\" $alt $title />";
+                        if ( $show_name )
+                                $output .= " $name";
+                } else {
+                        $output .= $name;
+                }
+                $output .= $link_after;
+                $output .= '</a>';
+                if ( $show_updated && $bookmark->recently_updated )
+                        $output .= get_option( 'links_recently_updated_append' );
+                if ( $show_description && '' != $desc )
+                        $output .= $between . $desc;
+                if ( $show_rating )
+                        $output .= $between . sanitize_bookmark_field( 'link_rating', $bookmark->link_rating, $bookmark->link_id, 'display' );
+                $output .= "$after\n";
+        } // end while
+        return $output;
+}
+/**
+ * Retrieve or echo all of the bookmarks.
+ *
+ * List of default arguments are as follows:
+ * 'orderby' - Default is 'name' (string). How to order the links by. String is
+ *              based off of the bookmark scheme.
+ * 'order' - Default is 'ASC' (string). Either 'ASC' or 'DESC'. Orders in either
+ *              ascending or descending order.
+ * 'limit' - Default is -1 (integer) or show all. The amount of bookmarks to
+ *              display.
+ * 'category' - Default is empty string (string). Include the links in what
+ *              category ID(s).
+ * 'category_name' - Default is empty string (string). Get links by category
+ *              name.
+ * 'hide_invisible' - Default is 1 (integer). Whether to show (default) or hide
+ *              links marked as 'invisible'.
+ * 'show_updated' - Default is 0 (integer). Will show the time of when the
+ *              bookmark was last updated.
+ * 'echo' - Default is 1 (integer). Whether to echo (default) or return the
+ *              formatted bookmarks.
+ * 'categorize' - Default is 1 (integer). Whether to show links listed by
+ *              category (default) or show links in one column.
+ * 'show_description' - Default is 0 (integer). Whether to show the description
+ *              of the bookmark.
+ *
+ * These options define how the Category name will appear before the category
+ * links are displayed, if 'categorize' is 1. If 'categorize' is 0, then it will
+ * display for only the 'title_li' string and only if 'title_li' is not empty.
+ * 'title_li' - Default is 'Bookmarks' (translatable string). What to show
+ *              before the links appear.
+ * 'title_before' - Default is '<h2>' (string). The HTML or text to show before
+ *              the 'title_li' string.
+ * 'title_after' - Default is '</h2>' (string). The HTML or text to show after
+ *              the 'title_li' string.
+ * 'class' - Default is 'linkcat' (string). The CSS class to use for the
+ *              'title_li'.
+ *
+ * 'category_before' - Default is '<li id="%id" class="%class">'. String must
+ *              contain '%id' and '%class' to get
+ * the id of the category and the 'class' argument. These are used for
+ *              formatting in themes.
+ * Argument will be displayed before the 'title_before' argument.
+ * 'category_after' - Default is '</li>' (string). The HTML or text that will
+ *              appear after the list of links.
+ *
+ * These are only used if 'categorize' is set to 1 or true.
+ * 'category_orderby' - Default is 'name'. How to order the bookmark category
+ *              based on term scheme.
+ * 'category_order' - Default is 'ASC'. Set the order by either ASC (ascending)
+ *              or DESC (descending).
+ *
+ * @see _walk_bookmarks() For other arguments that can be set in this function
+ *              and passed to _walk_bookmarks().
+ * @see get_bookmarks() For other arguments that can be set in this function and
+ *              passed to get_bookmarks().
+ * @link http://codex.wordpress.org/Template_Tags/wp_list_bookmarks
+ *
+ * @since WP 2.1.0
+ * @uses _walk_bookmarks() Used to iterate over all of the bookmarks and return
+ *              the html
+ * @uses get_terms() Gets all of the categories that are for links.
+ *
+ * @param string|array $args Optional. Overwrite the defaults of the function
+ * @return string|null Will only return if echo option is set to not echo.
+ *              Default is not return anything.
+ */
+function wp_list_bookmarks( $args = '' ) {
+        $defaults = array(
+                'orderby' => 'name', 'order' => 'ASC',
+                'limit' => -1, 'category' => '', 'exclude_category' => '',
+                'category_name' => '', 'hide_invisible' => 1,
+                'show_updated' => 0, 'echo' => 1,
+                'categorize' => 1, 'title_li' => __( 'Bookmarks' ),
+                'title_before' => '<h2>', 'title_after' => '</h2>',
+                'category_orderby' => 'name', 'category_order' => 'ASC',
+                'class' => 'linkcat', 'category_before' => '<li id="%id" class="%class">',
+                'category_after' => '</li>'
+        );
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+        $output = '';
+        if ( $categorize ) {
+                //Split the bookmarks into ul's for each category
+                $cats = get_terms( 'link_category', array( 'name__like' => $category_name, 'include' => $category, 'exclude' => $exclude_category, 'orderby' => $category_orderby, 'order' => $category_order, 'hierarchical' => 0));
+                foreach ( (array) $cats as $cat ) {
+                        $params = array_merge( $r, array( 'category'=>$cat->term_id ) );
+                        $bookmarks = get_bookmarks( $params );
+                        if ( empty( $bookmarks ) )
+                                continue;
+                        $output .= str_replace(array( '%id', '%class' ), array("linkcat-$cat->term_id", $class ), $category_before );
+                        $catname = apply_filters( "link_category", $cat->name );
+                        $output .= "$title_before$catname$title_after\n\t<ul class='xoxo blogroll'>\n";
+                        $output .= _walk_bookmarks( $bookmarks, $r );
+                        $output .= "\n\t</ul>\n$category_after\n";
+                }
+        } else {
+                //output one single list using title_li for the title
+                $bookmarks = get_bookmarks( $r );
+                if ( !empty( $bookmarks ) ) {
+                        if ( !empty( $title_li ) ){
+                                $output .= str_replace(array( '%id', '%class' ), array("linkcat-$category", $class ), $category_before );
+                                $output .= "$title_before$title_li$title_after\n\t<ul class='xoxo blogroll'>\n";
+                                $output .= _walk_bookmarks( $bookmarks, $r );
+                                $output .= "\n\t</ul>\n$category_after\n";
+                        } else {
+                                $output .= _walk_bookmarks( $bookmarks, $r );
+                        }
+                }
+        }
+        $output = apply_filters( 'wp_list_bookmarks', $output );
+        if ( !$echo )
+                return $output;
+        echo $output;
+}

wp-content/plugins/link-manager/deprecated.php

+<?php
+/**
+ * Gets the links associated with category $cat_name.
+ *
+ * @since WP 0.71
+ * @deprecated WP 2.1
+ * @deprecated WP Use get_bookmarks()
+ * @see get_bookmarks()
+ *
+ * @param string $cat_name Optional. The category name to use. If no match is found uses all.
+ * @param string $before Optional. The html to output before the link.
+ * @param string $after Optional. The html to output after the link.
+ * @param string $between Optional. The html to output between the link/image and it's description. Not used if no image or $show_images is true.
+ * @param bool $show_images Optional. Whether to show images (if defined).
+ * @param string $orderby Optional. The order to output the links. E.g. 'id', 'name', 'url', 'description' or 'rating'. Or maybe owner.
+ *              If you start the name with an underscore the order will be reversed. You can also specify 'rand' as the order which will return links in a
+ *              random order.
+ * @param bool $show_description Optional. Whether to show the description if show_images=false/not defined.
+ * @param bool $show_rating Optional. Show rating stars/chars.
+ * @param int $limit            Optional. Limit to X entries. If not specified, all entries are shown.
+ * @param int $show_updated Optional. Whether to show last updated timestamp
+ */
+function get_linksbyname($cat_name = "noname", $before = '', $after = '<br />', $between = " ", $show_images = true, $orderby = 'id',
+                                                 $show_description = true, $show_rating = false,
+                                                 $limit = -1, $show_updated = 0) {
+        _deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+        $cat_id = -1;
+        $cat = get_term_by('name', $cat_name, 'link_category');
+        if ( $cat )
+                $cat_id = $cat->term_id;
+        get_links($cat_id, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated);
+}
+/**
+ * Gets the links associated with the named category.
+ *
+ * @since WP 1.0.1
+ * @deprecated WP 2.1
+ * @deprecated WP Use wp_list_bookmarks()
+ * @see wp_list_bookmarks()
+ *
+ * @param string $category The category to use.
+ * @param string $args
+ * @return bool|null
+ */
+function wp_get_linksbyname($category, $args = '') {
+        _deprecated_function(__FUNCTION__, '2.1', 'wp_list_bookmarks()');
+        $defaults = array(
+                'after' => '<br />',
+                'before' => '',
+                'categorize' => 0,
+                'category_after' => '',
+                'category_before' => '',
+                'category_name' => $category,
+                'show_description' => 1,
+                'title_li' => '',
+        );
+        $r = wp_parse_args( $args, $defaults );
+        return wp_list_bookmarks($r);
+}
+/**
+ * Gets an array of link objects associated with category $cat_name.
+ *
+ * <code>
+ *      $links = get_linkobjectsbyname('fred');
+ *      foreach ($links as $link) {
+ *              echo '<li>'.$link->link_name.'</li>';
+ *      }
+ * </code>
+ *
+ * @since WP 1.0.1
+ * @deprecated WP 2.1
+ * @deprecated WP Use get_bookmarks()
+ * @see get_bookmarks()
+ *
+ * @param string $cat_name The category name to use. If no match is found uses all.
+ * @param string $orderby The order to output the links. E.g. 'id', 'name', 'url', 'description', or 'rating'.
+ *              Or maybe owner. If you start the name with an underscore the order will be reversed. You can also
+ *              specify 'rand' as the order which will return links in a random order.
+ * @param int $limit Limit to X entries. If not specified, all entries are shown.
+ * @return unknown
+ */
+function get_linkobjectsbyname($cat_name = "noname" , $orderby = 'name', $limit = -1) {
+        _deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+        $cat_id = -1;
+        $cat = get_term_by('name', $cat_name, 'link_category');
+        if ( $cat )
+                $cat_id = $cat->term_id;
+        return get_linkobjects($cat_id, $orderby, $limit);
+}
+/**
+ * Gets an array of link objects associated with category n.
+ *
+ * Usage:
+ * <code>
+ *      $links = get_linkobjects(1);
+ *      if ($links) {
+ *              foreach ($links as $link) {
+ *                      echo '<li>'.$link->link_name.'<br />'.$link->link_description.'</li>';
+ *              }
+ *      }
+ * </code>
+ *
+ * Fields are:
+ * <ol>
+ *      <li>link_id</li>
+ *      <li>link_url</li>
+ *      <li>link_name</li>
+ *      <li>link_image</li>
+ *      <li>link_target</li>
+ *      <li>link_category</li>
+ *      <li>link_description</li>
+ *      <li>link_visible</li>
+ *      <li>link_owner</li>
+ *      <li>link_rating</li>
+ *      <li>link_updated</li>
+ *      <li>link_rel</li>
+ *      <li>link_notes</li>
+ * </ol>
+ *
+ * @since WP 1.0.1
+ * @deprecated WP 2.1
+ * @deprecated WP Use get_bookmarks()
+ * @see get_bookmarks()
+ *
+ * @param int $category The category to use. If no category supplied uses all
+ * @param string $orderby the order to output the links. E.g. 'id', 'name', 'url',
+ *              'description', or 'rating'. Or maybe owner. If you start the name with an
+ *              underscore the order will be reversed. You can also specify 'rand' as the
+ *              order which will return links in a random order.
+ * @param int $limit Limit to X entries. If not specified, all entries are shown.
+ * @return unknown
+ */
+function get_linkobjects($category = 0, $orderby = 'name', $limit = 0) {
+        _deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+        $links = get_bookmarks( array( 'category' => $category, 'orderby' => $orderby, 'limit' => $limit ) ) ;
+        $links_array = array();
+        foreach ($links as $link)
+                $links_array[] = $link;
+        return $links_array;
+}
+/**
+ * Gets the links associated with category 'cat_name' and display rating stars/chars.
+ *
+ * @since WP 0.71
+ * @deprecated WP 2.1
+ * @deprecated WP Use get_bookmarks()
+ * @see get_bookmarks()
+ *
+ * @param string $cat_name The category name to use. If no match is found uses all
+ * @param string $before The html to output before the link
+ * @param string $after The html to output after the link
+ * @param string $between The html to output between the link/image and it's description. Not used if no image or show_images is true
+ * @param bool $show_images Whether to show images (if defined).
+ * @param string $orderby the order to output the links. E.g. 'id', 'name', 'url',
+ *              'description', or 'rating'. Or maybe owner. If you start the name with an
+ *              underscore the order will be reversed. You can also specify 'rand' as the
+ *              order which will return links in a random order.
+ * @param bool $show_description Whether to show the description if show_images=false/not defined
+ * @param int $limit Limit to X entries. If not specified, all entries are shown.
+ * @param int $show_updated Whether to show last updated timestamp
+ */
+function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = '<br />', $between = " ",
+                                                                        $show_images = true, $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
+        _deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+        get_linksbyname($cat_name, $before, $after, $between, $show_images, $orderby, $show_description, true, $limit, $show_updated);
+}
+/**
+ * Gets the links associated with category n and display rating stars/chars.
+ *
+ * @since WP 0.71
+ * @deprecated WP 2.1
+ * @deprecated WP Use get_bookmarks()
+ * @see get_bookmarks()
+ *
+ * @param int $category The category to use. If no category supplied uses all
+ * @param string $before The html to output before the link
+ * @param string $after The html to output after the link
+ * @param string $between The html to output between the link/image and it's description. Not used if no image or show_images == true
+ * @param bool $show_images Whether to show images (if defined).
+ * @param string $orderby The order to output the links. E.g. 'id', 'name', 'url',
+ *              'description', or 'rating'. Or maybe owner. If you start the name with an
+ *              underscore the order will be reversed. You can also specify 'rand' as the
+ *              order which will return links in a random order.
+ * @param bool $show_description Whether to show the description if show_images=false/not defined.
+ * @param string $limit Limit to X entries. If not specified, all entries are shown.
+ * @param int $show_updated Whether to show last updated timestamp
+ */
+function get_links_withrating($category = -1, $before = '', $after = '<br />', $between = " ", $show_images = true,
+                                                          $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
+        _deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+        get_links($category, $before, $after, $between, $show_images, $orderby, $show_description, true, $limit, $show_updated);
+}
+/**
+ * Gets the links associated with category.
+ *
+ * @see get_links() for argument information that can be used in $args
+ * @since WP 1.0.1
+ * @deprecated WP 2.1
+ * @deprecated WP Use wp_list_bookmarks()
+ * @see wp_list_bookmarks()
+ *
+ * @param string $args a query string
+ * @return null|string
+ */
+function wp_get_links($args = '') {
+        _deprecated_function( __FUNCTION__, '2.1', 'wp_list_bookmarks()' );
+        if ( strpos( $args, '=' ) === false ) {
+                $cat_id = $args;
+                $args = add_query_arg( 'category', $cat_id, $args );
+        }
+        $defaults = array(
+                'after' => '<br />',
+                'before' => '',
+                'between' => ' ',
+                'categorize' => 0,
+                'category' => '',
+                'echo' => true,
+                'limit' => -1,
+                'orderby' => 'name',
+                'show_description' => true,
+                'show_images' => true,
+                'show_rating' => false,
+                'show_updated' => true,
+                'title_li' => '',
+        );
+        $r = wp_parse_args( $args, $defaults );
+        return wp_list_bookmarks($r);
+}
+/**
+ * Gets the links associated with category by id.
+ *
+ * @since WP 0.71
+ * @deprecated WP 2.1
+ * @deprecated WP Use get_bookmarks()
+ * @see get_bookmarks()
+ *
+ * @param int $category The category to use. If no category supplied uses all
+ * @param string $before the html to output before the link
+ * @param string $after the html to output after the link
+ * @param string $between the html to output between the link/image and its description.
+ *              Not used if no image or show_images == true
+ * @param bool $show_images whether to show images (if defined).
+ * @param string $orderby the order to output the links. E.g. 'id', 'name', 'url',
+ *              'description', or 'rating'. Or maybe owner. If you start the name with an
+ *              underscore the order will be reversed. You can also specify 'rand' as the order
+ *              which will return links in a random order.
+ * @param bool $show_description whether to show the description if show_images=false/not defined.
+ * @param bool $show_rating show rating stars/chars
+ * @param int $limit Limit to X entries. If not specified, all entries are shown.
+ * @param int $show_updated whether to show last updated timestamp
+ * @param bool $echo whether to echo the results, or return them instead
+ * @return null|string
+ */
+function get_links($category = -1, $before = '', $after = '<br />', $between = ' ', $show_images = true, $orderby = 'name',
+                        $show_description = true, $show_rating = false, $limit = -1, $show_updated = 1, $echo = true) {
+        _deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+        $order = 'ASC';
+        if ( substr($orderby, 0, 1) == '_' ) {
+                $order = 'DESC';
+                $orderby = substr($orderby, 1);
+        }
+        if ( $category == -1 ) //get_bookmarks uses '' to signify all categories
+                $category = '';
+        $results = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'order' => $order, 'show_updated' => $show_updated, 'limit' => $limit));
+        if ( !$results )
+                return;
+        $output = '';
+        foreach ( (array) $results as $row ) {
+                if ( !isset($row->recently_updated) )
+                        $row->recently_updated = false;
+                $output .= $before;
+                if ( $show_updated && $row->recently_updated )
+                        $output .= get_option('links_recently_updated_prepend');
+                $the_link = '#';
+                if ( !empty($row->link_url) )
+                        $the_link = esc_url($row->link_url);
+                $rel = $row->link_rel;
+                if ( '' != $rel )
+                        $rel = ' rel="' . $rel . '"';
+                $desc = esc_attr(sanitize_bookmark_field('link_description', $row->link_description, $row->link_id, 'display'));
+                $name = esc_attr(sanitize_bookmark_field('link_name', $row->link_name, $row->link_id, 'display'));
+                $title = $desc;
+                if ( $show_updated )
+                        if (substr($row->link_updated_f, 0, 2) != '00')
+                                $title .= ' ('.__('Last updated') . ' ' . date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * 3600)) . ')';
+                if ( '' != $title )
+                        $title = ' title="' . $title . '"';
+                $alt = ' alt="' . $name . '"';
+                $target = $row->link_target;
+                if ( '' != $target )
+                        $target = ' target="' . $target . '"';
+                $output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
+                if ( $row->link_image != null && $show_images ) {
+                        if ( strpos($row->link_image, 'http') !== false )
+                                $output .= "<img src=\"$row->link_image\" $alt $title />";
+                        else // If it's a relative path
+                                $output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
+                } else {
+                        $output .= $name;
+                }
+                $output .= '</a>';
+                if ( $show_updated && $row->recently_updated )
+                        $output .= get_option('links_recently_updated_append');
+                if ( $show_description && '' != $desc )
+                        $output .= $between . $desc;
+                if ($show_rating) {
+                        $output .= $between . get_linkrating($row);
+                }
+                $output .= "$after\n";
+        } // end while
+        if ( !$echo )
+                return $output;
+        echo $output;
+}
+/**
+ * Output entire list of links by category.
+ *
+ * Output a list of all links, listed by category, using the settings in
+ * $wpdb->linkcategories and output it as a nested HTML unordered list.
+ *
+ * @since WP 1.0.1
+ * @deprecated WP 2.1
+ * @deprecated WP Use wp_list_bookmarks()
+ * @see wp_list_bookmarks()
+ *
+ * @param string $order Sort link categories by 'name' or 'id'
+ */
+function get_links_list($order = 'name') {
+        _deprecated_function( __FUNCTION__, '2.1', 'wp_list_bookmarks()' );
+        $order = strtolower($order);
+        // Handle link category sorting
+        $direction = 'ASC';
+        if ( '_' == substr($order,0,1) ) {
+                $direction = 'DESC';
+                $order = substr($order,1);
+        }
+        if ( !isset($direction) )
+                $direction = '';
+        $cats = get_categories(array('type' => 'link', 'orderby' => $order, 'order' => $direction, 'hierarchical' => 0));
+        // Display each category
+        if ( $cats ) {
+                foreach ( (array) $cats as $cat ) {
+                        // Handle each category.
+                        // Display the category name
+                        echo '  <li id="linkcat-' . $cat->term_id . '" class="linkcat"><h2>' . apply_filters('link_category', $cat->name ) . "</h2>\n\t<ul>\n";
+                        // Call get_links() with all the appropriate params
+                        get_links($cat->term_id, '<li>', "</li>", "\n", true, 'name', false);
+                        // Close the last category
+                        echo "\n\t</ul>\n</li>\n";
+                }
+        }
+}
+/**
+ * Show the link to the links popup and the number of links.
+ *
+ * @since WP 0.71
+ * @deprecated WP 2.1
+ * @deprecated WP {@internal Use function instead is unknown}}
+ *
+ * @param string $text the text of the link
+ * @param int $width the width of the popup window
+ * @param int $height the height of the popup window
+ * @param string $file the page to open in the popup window
+ * @param bool $count the number of links in the db
+ */
+function links_popup_script($text = 'Links', $width=400, $height=400, $file='links.all.php', $count = true) {
+        _deprecated_function( __FUNCTION__, '2.1' );
+        if ( $count )
+                $counts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->links");
+        $javascript = "<a href=\"#\" onclick=\"javascript:window.open('$file?popup=1', '_blank', 'width=$width,height=$height,scrollbars=yes,status=no'); return false\">";
+        $javascript .= $text;
+        if ( $count )
+                $javascript .= " ($counts)";
+        $javascript .= "</a>\n\n";
+                echo $javascript;
+}
+/**
+ * @since WP 1.0.1
+ * @deprecated WP 2.1
+ * @deprecated WP Use sanitize_bookmark_field()
+ * @see sanitize_bookmark_field()
+ *
+ * @param object $link
+ * @return unknown
+ */
+function get_linkrating($link) {
+        _deprecated_function( __FUNCTION__, '2.1', 'sanitize_bookmark_field()' );
+        return sanitize_bookmark_field('link_rating', $link->link_rating, $link->link_id, 'display');
+}
+/**
+ * Gets the name of category by id.
+ *
+ * @since WP 0.71
+ * @deprecated WP 2.1
+ * @deprecated WP Use get_category()
+ * @see get_category()
+ *
+ * @param int $id The category to get. If no category supplied uses 0
+ * @return string
+ */
+function get_linkcatname($id = 0) {
+        _deprecated_function( __FUNCTION__, '2.1', 'get_category()' );
+        $id = (int) $id;
+        if ( empty($id) )
+                return '';
+        $cats = wp_get_link_cats($id);
+        if ( empty($cats) || ! is_array($cats) )
+                return '';
+        $cat_id = (int) $cats[0]; // Take the first cat.
+        $cat = get_category($cat_id);
+        return $cat->name;
+}
+/**
+ * Retrieve bookmark data based on ID.
+ *
+ * @since WP 2.0.0
+ * @deprecated WP 2.1.0
+ * @deprecated WP Use get_bookmark()
+ * @see get_bookmark()
+ *
+ * @param int $bookmark_id ID of link
+ * @param string $output OBJECT, ARRAY_N, or ARRAY_A
+ * @return object|array
+ */
+function get_link($bookmark_id, $output = OBJECT, $filter = 'raw') {
+        _deprecated_function( __FUNCTION__, '2.1', 'get_bookmark()' );
+        return get_bookmark($bookmark_id, $output, $filter);
+}
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.1.0
+ * @deprecated 2.6.0
+ * @deprecated Use wp_link_category_checklist()
+ * @see wp_link_category_checklist()
+ *
+ * @param unknown_type $default
+ */
+function dropdown_link_categories( $default = 0 ) {
+        _deprecated_function( __FUNCTION__, '2.6', 'wp_link_category_checklist()' );
+        global $link_id;
+        wp_link_category_checklist( $link_id );
+}
+ No newline at end of file

wp-content/plugins/link-manager/admin/edit-link-form.php

+<?php
+/**
+ * Edit links form for inclusion in administration panels.
+ *
+ * @package Link Manager
+ * @subpackage Administration
+ */
+// don't load directly
+if ( !defined( 'ABSPATH' ) )
+        die('-1');
+$main_action = menu_page_url( 'link-manager.php', false );
+if ( ! empty( $link_id ) ) {
+        $heading = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), $main_action );
+        $submit_text = __('Update Link');
+        $form = '<form name="editlink" id="editlink" method="post" action="' . $main_action . '">';
+        $nonce_action = 'update-bookmark_' . $link_id;
+} else {
+        $heading = sprintf( __( '<a href="%s">Links</a> / Add New Link' ), $main_action );
+        $submit_text = __('Add Link');
+        $form = '<form name="addlink" id="addlink" method="post" action="' . $main_action . '">';
+        $nonce_action = 'add-bookmark';
+}
+add_meta_box( 'linksubmitdiv', __('Save'), 'link_submit_meta_box', 'link', 'side', 'core' );
+add_meta_box( 'linkcategorydiv', __('Categories'), 'link_categories_meta_box', null, 'normal', 'core' );
+add_meta_box( 'linktargetdiv', __('Target'), 'link_target_meta_box', null, 'normal', 'core' );
+add_meta_box( 'linkxfndiv', __('Link Relationship (XFN)'), 'link_xfn_meta_box', null, 'normal', 'core' );
+add_meta_box( 'linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', null, 'normal', 'core' );
+do_action( 'add_meta_boxes', 'link', $link );
+do_action( 'add_meta_boxes_link', $link );
+do_action( 'do_meta_boxes', 'link', 'normal', $link );
+do_action( 'do_meta_boxes', 'link', 'advanced', $link );
+do_action( 'do_meta_boxes', 'link', 'side', $link );
+?>
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php echo esc_html( $title ); ?>  <a href="<?php menu_page_url( 'link-add.php' ) ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'link' ) ?></a></h2>
+<?php if ( isset( $_GET['added'] ) ) : ?>
+<div id="message" class="updated"><p><?php _e( 'Link added.' ); ?></p></div>
+<?php endif; ?>
+<?php
+if ( !empty( $form ) )
+        echo $form;
+if ( !empty( $link_added ) )
+        echo $link_added;
+wp_nonce_field( $nonce_action );
+wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
+wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
+<div id="poststuff">
+<div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
+<div id="post-body-content">
+<div id="namediv" class="stuffbox">
+<h3><label for="link_name"><?php _ex('Name', 'link name') ?></label></h3>
+<div class="inside">
+        <input type="text" name="link_name" size="30" value="<?php echo esc_attr( $link->link_name ); ?>" id="link_name" />
+    <p><?php _e( 'Example: Nifty blogging software' ); ?></p>
+</div>
+</div>
+<div id="addressdiv" class="stuffbox">
+<h3><label for="link_url"><?php _e('Web Address') ?></label></h3>
+<div class="inside">
+        <input type="text" name="link_url" size="30" class="code" value="<?php echo esc_attr( $link->link_url ); ?>" id="link_url" />
+    <p><?php _e( 'Example: <code>http://wordpress.org/</code> &#8212; don&#8217;t forget the <code>http://</code>' ); ?></p>
+</div>
+</div>
+<div id="descriptiondiv" class="stuffbox">
+<h3><label for="link_description"><?php _e('Description') ?></label></h3>
+<div class="inside">
+        <input type="text" name="link_description" size="30" value="<?php echo isset( $link->link_description ) ? esc_attr( $link->link_description ) : ''; ?>" id="link_description" />
+    <p><?php _e( 'This will be shown when someone hovers over the link in the blogroll, or optionally below the link.' ); ?></p>
+</div>
+</div>
+</div><!-- /post-body-content -->
+<div id="postbox-container-1" class="postbox-container">
+<?php
+do_action( 'submitlink_box' );
+$side_meta_boxes = do_meta_boxes( 'link', 'side', $link );
+?>
+</div>
+<div id="postbox-container-2" class="postbox-container">
+<?php
+do_meta_boxes( null, 'normal', $link );
+do_meta_boxes( null, 'advanced', $link );
+?>
+</div>
+<?php
+if ( $link_id ) : ?>
+<input type="hidden" name="action" value="save" />
+<input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" />
+<input type="hidden" name="order_by" value="<?php echo esc_attr( $order_by ); ?>" />
+<input type="hidden" name="cat_id" value="<?php echo (int) $cat_id ?>" />
+<?php else: ?>
+<input type="hidden" name="action" value="add" />
+<?php endif; ?>
+</div>
+</div>
+</form>
+</div>
+ No newline at end of file

wp-content/plugins/link-manager/admin/meta-boxes.php

+<?php
+// -- Link related Meta Boxes
+/**
+ * Display link create form fields.
+ *
+ * @since WP 2.7.0
+ *
+ * @param object $link
+ */
+function link_submit_meta_box( $link ) {
+?>
+<div class="submitbox" id="submitlink">
+<div id="minor-publishing">
+<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
+<div style="display:none;">
+<?php submit_button( __( 'Save' ), 'button', 'save', false ); ?>
+</div>
+<div id="minor-publishing-actions">
+<div id="preview-action">
+<?php if ( !empty($link->link_id) ) { ?>
+        <a class="preview button" href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a>
+<?php } ?>
+</div>
+<div class="clear"></div>
+</div>
+<div id="misc-publishing-actions">
+<div class="misc-pub-section">
+        <label for="link_private" class="selectit"><input id="link_private" name="link_visible" type="checkbox" value="N" <?php checked($link->link_visible, 'N'); ?> /> <?php _e('Keep this link private') ?></label>
+</div>
+</div>
+</div>
+<div id="major-publishing-actions">
+<?php do_action('post_submitbox_start'); ?>
+<div id="delete-action">
+<?php
+if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links') ) { ?>
+        <a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo esc_js(sprintf(__("You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
+<?php } ?>
+</div>
+<div id="publishing-action">
+<?php if ( !empty($link->link_id) ) { ?>
+        <input name="save" type="submit" class="button-primary" id="publish" accesskey="p" value="<?php esc_attr_e('Update Link') ?>" />
+<?php } else { ?>
+        <input name="save" type="submit" class="button-primary" id="publish" accesskey="p" value="<?php esc_attr_e('Add Link') ?>" />
+<?php } ?>
+</div>
+<div class="clear"></div>
+</div>
+<?php do_action('submitlink_box'); ?>
+<div class="clear"></div>
+</div>
+<?php
+}
+/**
+ * Display link categories form fields.
+ *
+ * @since WP 2.6.0
+ *
+ * @param object $link
+ */
+function link_categories_meta_box($link) {
+?>
+<div id="taxonomy-linkcategory" class="categorydiv">
+        <ul id="category-tabs" class="category-tabs">
+                <li class="tabs"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
+                <li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
+        </ul>
+        <div id="categories-all" class="tabs-panel">
+                <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
+                        <?php
+                        if ( isset($link->link_id) )
+                                wp_link_category_checklist($link->link_id);
+                        else
+                                wp_link_category_checklist();
+                        ?>
+                </ul>
+        </div>
+        <div id="categories-pop" class="tabs-panel" style="display: none;">
+                <ul id="categorychecklist-pop" class="categorychecklist form-no-clear">
+                        <?php wp_popular_terms_checklist('link_category'); ?>
+                </ul>
+        </div>
+        <div id="category-adder" class="wp-hidden-children">
+                <h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
+                <p id="link-category-add" class="wp-hidden-child">
+                        <label class="screen-reader-text" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
+                        <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" aria-required="true" />
+                        <input type="button" id="link-category-add-submit" class="add:categorychecklist:linkcategorydiv button" value="<?php esc_attr_e( 'Add' ); ?>" />
+                        <?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
+                        <span id="category-ajax-response"></span>
+                </p>
+        </div>
+</div>
+<?php
+}
+/**
+ * Display form fields for changing link target.
+ *
+ * @since WP 2.6.0
+ *
+ * @param object $link
+ */
+function link_target_meta_box($link) { ?>
+<fieldset><legend class="screen-reader-text"><span><?php _e('Target') ?></span></legend>
+<p><label for="link_target_blank" class="selectit">
+<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
+<?php _e('<code>_blank</code> &mdash; new window or tab.'); ?></label></p>
+<p><label for="link_target_top" class="selectit">
+<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
+<?php _e('<code>_top</code> &mdash; current window or tab, with no frames.'); ?></label></p>
+<p><label for="link_target_none" class="selectit">
+<input id="link_target_none" type="radio" name="link_target" value="" <?php echo ( isset( $link->link_target ) && ($link->link_target == '') ? 'checked="checked"' : ''); ?> />
+<?php _e('<code>_none</code> &mdash; same window or tab.'); ?></label></p>
+</fieldset>
+<p><?php _e('Choose the target frame for your link.'); ?></p>
+<?php
+}
+/**
+ * Display checked checkboxes attribute for xfn microformat options.
+ *
+ * @since WP 1.0.1
+ *
+ * @param string $class
+ * @param string $value
+ * @param mixed $deprecated Never used.
+ */
+function xfn_check( $class, $value = '', $deprecated = '' ) {
+        global $link;
+        if ( !empty( $deprecated ) )
+                _deprecated_argument( __FUNCTION__, '0.0' ); // Never implemented
+        $link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
+        $rels = preg_split('/\s+/', $link_rel);
+        if ('' != $value && in_array($value, $rels) ) {
+                echo ' checked="checked"';
+        }
+        if ('' == $value) {
+                if ('family' == $class && strpos($link_rel, 'child') === false && strpos($link_rel, 'parent') === false && strpos($link_rel, 'sibling') === false && strpos($link_rel, 'spouse') === false && strpos($link_rel, 'kin') === false) echo ' checked="checked"';
+                if ('friendship' == $class && strpos($link_rel, 'friend') === false && strpos($link_rel, 'acquaintance') === false && strpos($link_rel, 'contact') === false) echo ' checked="checked"';
+                if ('geographical' == $class && strpos($link_rel, 'co-resident') === false && strpos($link_rel, 'neighbor') === false) echo ' checked="checked"';
+                if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"';
+        }
+}
+/**
+ * Display xfn form fields.
+ *
+ * @since WP 2.6.0
+ *
+ * @param object $link
+ */
+function link_xfn_meta_box($link) {
+?>
+<table class="links-table" cellspacing="0">
+        <tr>
+                <th scope="row"><label for="link_rel"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('rel:') ?></label></th>
+                <td><input type="text" name="link_rel" id="link_rel" value="<?php echo ( isset( $link->link_rel ) ? esc_attr($link->link_rel) : ''); ?>" /></td>
+        </tr>
+        <tr>
+                <th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?></th>
+                <td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?></span></legend>
+                        <label for="me">
+                        <input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> />
+                        <?php _e('another web address of mine') ?></label>
+                </fieldset></td>
+        </tr>
+        <tr>
+                <th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?></th>
+                <td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?></span></legend>
+                        <label for="contact">
+                        <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('contact') ?>
+                        </label>
+                        <label for="acquaintance">
+                        <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('acquaintance') ?>
+                        </label>
+                        <label for="friend">
+                        <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friend') ?>
+                        </label>
+                        <label for="friendship">
+                        <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?>
+                        </label>
+                </fieldset></td>
+        </tr>
+        <tr>
+                <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('physical') ?> </th>
+                <td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('physical') ?></span></legend>
+                        <label for="met">
+                        <input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('met') ?>
+                        </label>
+                </fieldset></td>
+        </tr>
+        <tr>
+                <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('professional') ?> </th>
+                <td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('professional') ?></span></legend>
+                        <label for="co-worker">
+                        <input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('co-worker') ?>
+                        </label>
+                        <label for="colleague">
+                        <input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('colleague') ?>
+                        </label>
+                </fieldset></td>
+        </tr>
+        <tr>
+                <th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?></th>
+                <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?> </span></legend>
+                        <label for="co-resident">
+                        <input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('co-resident') ?>
+                        </label>
+                        <label for="neighbor">
+                        <input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check('geographical', 'neighbor'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('neighbor') ?>
+                        </label>
+                        <label for="geographical">
+                        <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?>
+                        </label>
+                </fieldset></td>
+        </tr>
+        <tr>
+                <th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?></th>
+                <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </span></legend>
+                        <label for="child">
+                        <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('child') ?>
+                        </label>
+                        <label for="kin">
+                        <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('kin') ?>
+                        </label>
+                        <label for="parent">
+                        <input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('parent') ?>
+                        </label>
+                        <label for="sibling">
+                        <input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check('family', 'sibling'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('sibling') ?>
+                        </label>
+                        <label for="spouse">
+                        <input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check('family', 'spouse'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('spouse') ?>
+                        </label>
+                        <label for="family">
+                        <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?>
+                        </label>
+                </fieldset></td>
+        </tr>
+        <tr>
+                <th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('romantic') ?></th>
+                <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('romantic') ?> </span></legend>
+                        <label for="muse">
+                        <input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('muse') ?>
+                        </label>
+                        <label for="crush">
+                        <input class="valinp" type="checkbox" name="romantic" value="crush" id="crush" <?php xfn_check('romantic', 'crush'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('crush') ?>
+                        </label>
+                        <label for="date">
+                        <input class="valinp" type="checkbox" name="romantic" value="date" id="date" <?php xfn_check('romantic', 'date'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('date') ?>
+                        </label>
+                        <label for="romantic">
+                        <input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('sweetheart') ?>
+                        </label>
+                </fieldset></td>
+        </tr>
+</table>
+<p><?php _e('If the link is to a person, you can specify your relationship with them using the above form. If you would like to learn more about the idea check out <a href="http://gmpg.org/xfn/">XFN</a>.'); ?></p>
+<?php
+}
+/**
+ * Display advanced link options form fields.
+ *
+ * @since WP 2.6.0
+ *
+ * @param object $link
+ */
+function link_advanced_meta_box($link) {
+?>
+<table class="links-table" cellpadding="0">
+        <tr>
+                <th scope="row"><label for="link_image"><?php _e('Image Address') ?></label></th>
+                <td><input type="text" name="link_image" class="code" id="link_image" value="<?php echo ( isset( $link->link_image ) ? esc_attr($link->link_image) : ''); ?>" /></td>
+        </tr>
+        <tr>
+                <th scope="row"><label for="rss_uri"><?php _e('RSS Address') ?></label></th>
+                <td><input name="link_rss" class="code" type="text" id="rss_uri" value="<?php echo ( isset( $link->link_rss ) ? esc_attr($link->link_rss) : ''); ?>" /></td>
+        </tr>
+        <tr>
+                <th scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th>
+                <td><textarea name="link_notes" id="link_notes" rows="10"><?php echo ( isset( $link->link_notes ) ? $link->link_notes : ''); // textarea_escaped ?></textarea></td>
+        </tr>
+        <tr>
+                <th scope="row"><label for="link_rating"><?php _e('Rating') ?></label></th>
+                <td><select name="link_rating" id="link_rating" size="1">
+                <?php
+                        for ( $r = 0; $r <= 10; $r++ ) {
+                                echo '<option value="' . $r . '"';
+                                if ( isset($link->link_rating) && $link->link_rating == $r )
+                                        echo ' selected="selected"';
+                                echo('>' . $r . '</option>');
+                        }
+                ?></select>&nbsp;<?php _e('(Leave at 0 for no rating.)') ?>
+                </td>
+        </tr>
+</table>
+<?php
+}
+ No newline at end of file

wp-content/plugins/link-manager/admin/class-wp-links-list-table.php

+<?php
+/**
+ * Links Manager List Table class.
+ *
+ * @package WordPress
+ * @subpackage List_Table
+ * @since 3.1.0
+ * @access private
+ */
+class WP_Links_List_Table extends WP_List_Table {
+        function __construct() {
+                parent::__construct( array(
+                        'plural' => 'bookmarks',
+                ) );
+        }
+        function ajax_user_can() {
+                return current_user_can( 'manage_links' );
+        }
+        function prepare_items() {
+                global $cat_id, $s, $orderby, $order;
+                wp_reset_vars( array( 'action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'orderby', 'order', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]', 's' ) );
+                $args = array( 'hide_invisible' => 0, 'hide_empty' => 0 );
+                if ( 'all' != $cat_id )
+                        $args['category'] = $cat_id;
+                if ( !empty( $s ) )
+                        $args['search'] = $s;
+                if ( !empty( $orderby ) )
+                        $args['orderby'] = $orderby;
+                if ( !empty( $order ) )
+                        $args['order'] = $order;
+                $this->items = get_bookmarks( $args );
+        }
+        function no_items() {
+                _e( 'No links found.' );
+        }
+        function get_bulk_actions() {
+                $actions = array();
+                $actions['delete'] = __( 'Delete' );
+                return $actions;
+        }
+        function extra_tablenav( $which ) {
+                global $cat_id;
+                if ( 'top' != $which )
+                        return;
+?>
+                <div class="alignleft actions">
+<?php
+                        $dropdown_options = array(
+                                'selected' => $cat_id,
+                                'name' => 'cat_id',
+                                'taxonomy' => 'link_category',
+                                'show_option_all' => __( 'View all categories' ),
+                                'hide_empty' => true,
+                                'hierarchical' => 1,
+                                'show_count' => 0,
+                                'orderby' => 'name',
+                        );
+                        wp_dropdown_categories( $dropdown_options );
+                        submit_button( __( 'Filter' ), 'secondary', false, false, array( 'id' => 'post-query-submit' ) );
+?>
+                </div>
+<?php
+        }
+        function get_columns() {
+                return array(
+                        'cb'         => '<input type="checkbox" />',
+                        'name'       => _x( 'Name', 'link name' ),
+                        'url'        => __( 'URL' ),
+                        'categories' => __( 'Categories' ),
+                        'rel'        => __( 'Relationship' ),
+                        'visible'    => __( 'Visible' ),
+                        'rating'     => __( 'Rating' )
+                );
+        }
+        function get_sortable_columns() {
+                return array(
+                        'name'    => 'name',
+                        'url'     => 'url',
+                        'visible' => 'visible',
+                        'rating'  => 'rating'
+                );
+        }
+        function display_rows() {
+                global $cat_id;
+                $alt = 0;
+                foreach ( $this->items as $link ) {
+                        $link = sanitize_bookmark( $link );
+                        $link->link_name = esc_attr( $link->link_name );
+                        $link->link_category = wp_get_link_cats( $link->link_id );
+                        $short_url = url_shorten( $link->link_url );
+                        $visible = ( $link->link_visible == 'Y' ) ? __( 'Yes' ) : __( 'No' );
+                        $rating  = $link->link_rating;
+                        $style = ( $alt++ % 2 ) ? '' : ' class="alternate"';
+                        $edit_link = get_edit_bookmark_link( $link );
+?>
+                <tr id="link-<?php echo $link->link_id; ?>" valign="middle" <?php echo $style; ?>>
+<?php
+                        list( $columns, $hidden ) = $this->get_column_info();
+                        foreach ( $columns as $column_name => $column_display_name ) {
+                                $class = "class='column-$column_name'";
+                                $style = '';
+                                if ( in_array( $column_name, $hidden ) )
+                                        $style = ' style="display:none;"';
+                                $attributes = $class . $style;
+                                switch ( $column_name ) {
+                                        case 'cb': ?>
+                                                <th scope="row" class="check-column">
+                                                        <label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>"><?php echo sprintf( __( 'Select %s' ), $link->link_name ); ?></label>
+                                                        <input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr( $link->link_id ); ?>" />
+                                                </th>
+                                                <?php
+                                                break;
+                                        case 'name':
+                                                echo "<td $attributes><strong><a class='row-title' href='$edit_link' title='" . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $link->link_name ) ) . "'>$link->link_name</a></strong><br />";
+                                                $menu_page_url = menu_page_url( 'link-manager.php', false );
+                                                $delete_url = add_query_arg( array( 'action' => 'delete', 'link_id' => $link->link_id ), $menu_page_url );
+                                                $actions = array();
+                                                $actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
+                                                $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( $delete_url, 'delete-bookmark_' . $link->link_id ) . "' onclick=\"if ( confirm( '" . esc_js( sprintf( __( "You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete." ), $link->link_name ) ) . "' ) ) { return true;}return false;\">" . __( 'Delete' ) . "</a>";
+                                                echo $this->row_actions( $actions );
+                                                echo '</td>';
+                                                break;
+                                        case 'url':
+                                                echo "<td $attributes><a href='$link->link_url' title='". esc_attr( sprintf( __( 'Visit %s' ), $link->link_name ) )."'>$short_url</a></td>";
+                                                break;
+                                        case 'categories':
+                                                ?><td <?php echo $attributes ?>><?php
+                                                $cat_names = array();
+                                                foreach ( $link->link_category as $category ) {
+                                                        $cat = get_term( $category, 'link_category', OBJECT, 'display' );
+                                                        if ( is_wp_error( $cat ) )
+                                                                echo $cat->get_error_message();
+                                                        $cat_name = $cat->name;
+                                                        if ( $cat_id != $category )
+                                                                $cat_name = "<a href='link-manager.php?cat_id=$category'>$cat_name</a>";
+                                                        $cat_names[] = $cat_name;
+                                                }
+                                                echo implode( ', ', $cat_names );
+                                                ?></td><?php
+                                                break;
+                                        case 'rel':
+                                                ?><td <?php echo $attributes ?>><?php echo empty( $link->link_rel ) ? '<br />' : $link->link_rel; ?></td><?php
+                                                break;
+                                        case 'visible':
+                                                ?><td <?php echo $attributes ?>><?php echo $visible; ?></td><?php
+                                                break;
+                                        case 'rating':
+                                                ?><td <?php echo $attributes ?>><?php echo $rating; ?></td><?php
+                                                break;
+                                        default:
+                                                ?>
+                                                <td <?php echo $attributes ?>><?php do_action( 'manage_link_custom_column', $column_name, $link->link_id ); ?></td>
+                                                <?php
+                                                break;
+                                }
+                        }
+?>
+                </tr>
+<?php
+                }
+        }
+}

wp-content/plugins/link-manager/admin/link-manager.php

+<?php
+/**
+ * Link Management Administration Screen.
+ *
+ * @package Link Manager
+ * @subpackage Administration
+ */
+?>
+<div class="wrap nosubsub">
+<?php screen_icon(); ?>
+<h2><?php _e( 'Links' ) ?> <a href="<?php menu_page_url( 'link-add.php' ) ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'link' ); ?></a> <?php
+if ( !empty($_REQUEST['s']) )
+        printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes( $_REQUEST['s'] ) ) ); ?>
+</h2>
+<?php
+if ( isset( $_REQUEST['deleted'] ) ) {
+        echo '<div id="message" class="updated"><p>';
+        $deleted = (int) $_REQUEST['deleted'];
+        printf( _n( '%s link deleted.', '%s links deleted', $deleted ), $deleted );
+        echo '</p></div>';
+        $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'deleted' ), $_SERVER['REQUEST_URI'] );
+}
+?>
+<form id="posts-filter" action="<?php menu_page_url( 'link-manager.php' ) ?>" method="post">
+<?php
+$wp_list_table->search_box( __( 'Search Links' ), 'link' );
+$wp_list_table->display();
+?>
+<div id="ajax-response"></div>
+</form>
+</div>
+ No newline at end of file

wp-content/plugins/link-manager/widget.php

+<?php
+/**
+ * Links widget class
+ *
+ * @since WP 2.8.0
+ */
+class WP_Widget_Links extends WP_Widget {
+        function __construct() {
+                $widget_ops = array( 'description' => __( "Your blogroll" ) );
+                parent::__construct( 'links', __( 'Links' ), $widget_ops );
+        }
+        function widget( $args, $instance ) {
+                extract( $args, EXTR_SKIP );
+                $show_description = isset( $instance['description'] ) ? $instance['description'] : false;
+                $show_name = isset( $instance['name'] ) ? $instance['name'] : false;
+                $show_rating = isset( $instance['rating'] ) ? $instance['rating'] : false;
+                $show_images = isset( $instance['images'] ) ? $instance['images'] : true;
+                $category = isset( $instance['category'] ) ? $instance['category'] : false;
+                $orderby = isset( $instance['orderby'] ) ? $instance['orderby'] : 'name';
+                $order = $orderby == 'rating' ? 'DESC' : 'ASC';
+                $limit = isset( $instance['limit'] ) ? $instance['limit'] : -1;
+                $before_widget = preg_replace( '/id="[^"]*"/','id="%id"', $before_widget );
+                wp_list_bookmarks( apply_filters( 'widget_links_args', array(
+                        'title_before' => $before_title, 'title_after' => $after_title,
+                        'category_before' => $before_widget, 'category_after' => $after_widget,
+                        'show_images' => $show_images, 'show_description' => $show_description,
+                        'show_name' => $show_name, 'show_rating' => $show_rating,
+                        'category' => $category, 'class' => 'linkcat widget',
+                        'orderby' => $orderby, 'order' => $order,
+                        'limit' => $limit,
+                ) ) );
+        }
+        function update( $new_instance, $old_instance ) {
+                $new_instance = (array) $new_instance;
+                $instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0 );
+                foreach ( $instance as $field => $val ) {
+                        if ( isset( $new_instance[$field] ) )
+                                $instance[$field] = 1;
+                }
+                $instance['orderby'] = 'name';
+                if ( in_array( $new_instance['orderby'], array( 'name', 'rating', 'id', 'rand' ) ) )
+                        $instance['orderby'] = $new_instance['orderby'];
+                $instance['category'] = intval( $new_instance['category'] );
+                $instance['limit'] = ! empty( $new_instance['limit'] ) ? intval( $new_instance['limit'] ) : -1;
+                return $instance;
+        }
+        function form( $instance ) {
+                //Defaults
+                $instance = wp_parse_args( (array) $instance, array( 'images' => true, 'name' => true, 'description' => false, 'rating' => false, 'category' => false, 'orderby' => 'name', 'limit' => -1 ) );
+                $link_cats = get_terms( 'link_category' );
+                if ( ! $limit = intval( $instance['limit'] ) )
+                        $limit = -1;
+?>
+                <p>
+                <label for="<?php echo $this->get_field_id( 'category' ); ?>"><?php _e( 'Select Link Category:' ); ?></label>
+                <select class="widefat" id="<?php echo $this->get_field_id( 'category' ); ?>" name="<?php echo $this->get_field_name( 'category' ); ?>">
+                <option value=""><?php _ex( 'All Links', 'links widget' ); ?></option>
+                <?php
+                foreach ( $link_cats as $link_cat ) {
+                        echo '<option value="' . intval( $link_cat->term_id ) . '"'
+                                . ( $link_cat->term_id == $instance['category'] ? ' selected="selected"' : '' )
+                                . '>' . $link_cat->name . "</option>\n";
+                }
+                ?>
+                </select>
+                <label for="<?php echo $this->get_field_id( 'orderby' ); ?>"><?php _e( 'Sort by:' ); ?></label>
+                <select name="<?php echo $this->get_field_name( 'orderby' ); ?>" id="<?php echo $this->get_field_id( 'orderby' ); ?>" class="widefat">
+                        <option value="name"<?php selected( $instance['orderby'], 'name' ); ?>><?php _e( 'Link title' ); ?></option>
+                        <option value="rating"<?php selected( $instance['orderby'], 'rating' ); ?>><?php _e( 'Link rating' ); ?></option>
+                        <option value="id"<?php selected( $instance['orderby'], 'id' ); ?>><?php _e( 'Link ID' ); ?></option>
+                        <option value="rand"<?php selected( $instance['orderby'], 'rand' ); ?>><?php _e( 'Random' ); ?></option>
+                </select>
+                </p>
+                <p>
+                <input class="checkbox" type="checkbox" <?php checked( $instance['images'], true ) ?> id="<?php echo $this->get_field_id( 'images' ); ?>" name="<?php echo $this->get_field_name( 'images' ); ?>" />
+                <label for="<?php echo $this->get_field_id( 'images' ); ?>"><?php _e( 'Show Link Image' ); ?></label><br />
+                <input class="checkbox" type="checkbox" <?php checked( $instance['name'], true ) ?> id="<?php echo $this->get_field_id( 'name' ); ?>" name="<?php echo $this->get_field_name( 'name' ); ?>" />
+                <label for="<?php echo $this->get_field_id( 'name' ); ?>"><?php _e( 'Show Link Name' ); ?></label><br />
+                <input class="checkbox" type="checkbox" <?php checked( $instance['description'], true ) ?> id="<?php echo $this->get_field_id( 'description' ); ?>" name="<?php echo $this->get_field_name( 'description' ); ?>" />
+                <label for="<?php echo $this->get_field_id( 'description' ); ?>"><?php _e( 'Show Link Description' ); ?></label><br />
+                <input class="checkbox" type="checkbox" <?php checked( $instance['rating'], true ) ?> id="<?php echo $this->get_field_id( 'rating' ); ?>" name="<?php echo $this->get_field_name( 'rating' ); ?>" />
+                <label for="<?php echo $this->get_field_id( 'rating' ); ?>"><?php _e( 'Show Link Rating' ); ?></label>
+                </p>
+                <p>
+                <label for="<?php echo $this->get_field_id( 'limit' ); ?>"><?php _e( 'Number of links to show:' ); ?></label>
+                <input id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="text" value="<?php echo $limit == -1 ? '' : intval( $limit ); ?>" size="3" />
+                </p>
+<?php
+        }
+}
+ No newline at end of file

wp-content/plugins/link-manager/link-manager.php

+<?php
+/*
+Plugin Name: Link Manager
+Description: Manages links
+Author: Scott Taylor
+Version: 1.0
+Author URI: http://scotty-t.com/
+*/
+define( 'LINK_MANAGER_URL', WP_PLUGIN_URL . '/link-manager' );
+define( 'LINK_MANAGER_DIR', WP_PLUGIN_DIR . '/link-manager' );
+require( LINK_MANAGER_DIR . '/functions.php' );
+require( LINK_MANAGER_DIR . '/deprecated.php' );
+require( LINK_MANAGER_DIR . '/bookmark.php' );
+require( LINK_MANAGER_DIR . '/bookmark-template.php' );
+require( LINK_MANAGER_DIR . '/widget.php' );
+register_activation_hook( __FILE__, array( 'LinkManagerPlugin', 'install_defaults' ) );
+class LinkManagerPlugin {
+        var $reset_vars;
+        var $wp_list_table;
+        private static $instance;
+        public static function get_instance() {
+                if ( !isset( self::$instance ) )
+                        self::$instance = new LinkManagerPlugin();
+                return self::$instance;
+        }
+        private function __construct() {
+                $this->reset_vars =  array(
+                        'action', 'cat_id', 'linkurl', 'name', 'image', 'description',
+                        'visible', 'target', 'category', 'link_id', 'submit', 'order_by',
+                        'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]'
+                );
+                add_action( 'init',     array( $this, 'create_taxonomy' ), 0 );
+                add_action( 'widgets_init',     array( $this, 'widgets_init' ), 1 );
+                add_action( '_admin_menu', array( $this, 'menu_compat' ) );
+                add_action( 'admin_menu', array( $this, 'menu' ) );
+                add_action( 'admin_bar_menu', array( $this, 'admin_bar_menu' ), 71 );
+                add_action( 'admin_head', array( $this, 'menu_css' ) );
+                add_filter( 'whitelist_options', array( $this, 'whitelist_options' ) );
+                add_filter( 'terms_list_table_coumns', array( $this, 'terms_list_table_coumns' ) );
+                add_filter( 'dropdown_categories_args', array( $this, 'dropdown_categories_args' ) );
+                add_filter( 'get_categories_taxonomy', array( $this, 'get_categories_taxonomy' ), 10, 2 );
+                add_filter( 'sanitize_option_default_link_category', array( $this, 'sanitize_default_link_category' ) );
+                add_action( 'wpmu_delete_user', array( $this, 'wpmu_delete_user' ) );
+                add_action( 'delete_user', array( $this, 'delete_user' ) );
+                add_action( 'reassign_user_data', array( $this, 'reassign_user_data' ), 10, 2 );
+                add_action( 'edit_link_category_help', array( $this, 'edit_link_category_help' ) );
+                add_action( 'install_defaults', array( $this, 'install_defaults' ) );
+                add_action( 'admin_init', array( $this, 'add_settings_field' ) );
+                /**
+                 * AJAX Actions
+                 *
+                 */
+                add_action( 'wp_ajax_add-link-category', array( $this, 'ajax_add_link_category' ), 1 );
+                add_action( 'wp_ajax_delete-link', array( $this, 'ajax_delete_link' ), 1 );
+                /**
+                 * These switch the order of the actions, but I seriously doubt they are used at all
+                 * By hooking into these, we remove link_category-specific backcompat checks in admin code
+                 *
+                 */
+                add_action( 'load-edit-tags.php', array( $this, 'backcompat_load_taxnow' ) );
+                add_action( 'link_category_pre_add_form', array( $this, 'link_category_pre_add_form' ), 10, 2 );
+                add_action( 'link_category_add_form', array( $this, 'link_category_add_form' ), 10, 2 );
+                add_action( 'link_category_pre_edit_form', array( $this, 'link_category_pre_edit_form' ), 10, 2 );
+                add_action( 'link_category_edit_form_fields', array( $this, 'link_category_edit_form_fields' ), 10, 2 );
+                add_action( 'link_category_edit_form', array( $this, 'link_category_edit_form' ), 10, 2 );
+        }
+        function menu_css() {
+        ?>
+<style type="text/css">
+.toplevel_page_link-manager div.wp-menu-image {background-image: url('/wp-admin/images/menu.png?ver=20120201');}
+#adminmenu .toplevel_page_link-manager div.wp-menu-image {
+        background-position: -89px -33px;
+}
+#adminmenu .toplevel_page_link-manager:hover div.wp-menu-image,
+#adminmenu .toplevel_page_link-manager.wp-has-current-submenu div.wp-menu-image,
+#adminmenu .toplevel_page_link-manager.current div.wp-menu-image {
+        background-position: -89px -1px;
+}
+</style>
+        <?php
+        }
+        function create_taxonomy() {
+                register_taxonomy( 'link_category', 'link', array(
+                        'hierarchical' => false,
+                        'labels'        => array(
+                                'name'  => __( 'Link Categories' ),
+                                'singular_name' => __( 'Link Category' ),
+                                'search_items'  => __( 'Search Link Categories' ),
+                                'popular_items' => null,
+                                'all_items'             => __( 'All Link Categories' ),
+                                'edit_item'             => __( 'Edit Link Category' ),
+                                'update_item'   => __( 'Update Link Category' ),
+                                'add_new_item'  => __( 'Add New Link Category' ),
+                                'new_item_name' => __( 'New Link Category Name' ),
+                                'separate_items_with_commas' => null,
+                                'add_or_remove_items' => null,
+                                'choose_from_most_used' => null,
+                        ),
+                        'query_var' => false,
+                        'rewrite'       => false,
+                        'public'        => false,
+                        'show_ui'       => false,
+                        '_builtin'      => true,
+                ) );
+        }
+        function add_settings_field() {
+                add_settings_field(
+                        'default_link_category',
+                        __( 'Default Link Category' ),
+                        'wp_dropdown_categories',
+                        'writing',
+                        'default',
+                        array(
+                                'hide_empty'    => 0,
+                                'name'                  => 'default_link_category',
+                                'orderby'               => 'name',
+                                'selected'              => get_option( 'default_link_category' ),
+                                'hierarchical'  => true,
+                                'taxonomy'              => 'link_category'
+                        )
+                );
+        }
+        /**
+         * Register Links widget on startup.
+         *
+         */
+        function widgets_init() {
+                register_widget( 'WP_Widget_Links' );
+        }
+        function menu_compat() {
+                global $compat;
+                $compat['link-manager'] = 'links';
+        }
+        function menu() {
+                $links_page = add_menu_page( __( 'Links' ), __( 'Links' ), 'manage_links', 'link-manager.php', array( $this, 'admin_page' ), admin_url( 'wp-includes/images/blank.gif' ), 15 );
+                add_action( "load-{$links_page}", array( $this, 'load_admin_page' ) );
+                $all_links_page = add_links_page( _x( 'All Links', 'admin menu' ), _x( 'All Links', 'admin menu' ), 'manage_links', 'link-manager.php', array( $this, 'admin_page' ) );
+                if ( $links_page !== $all_links_page )
+                        add_action( "load-{$all_links_page}", array( $this, 'load_admin_page' ) );
+                /* translators: add new links */
+                $add_new_page = add_links_page( _x( 'Add New', 'link' ), _x( 'Add New', 'link' ), 'manage_links', 'link-add.php', array( $this, 'add_new_page' ) );
+                add_action( "load-{$add_new_page}", array( $this, 'load_add_new_page' ) );
+                add_links_page( __( 'Link Categories' ), __( 'Link Categories' ), 'manage_categories', 'edit-tags.php?taxonomy=link_category' );
+        }
+        function check_permissions() {
+                if ( ! current_user_can( 'manage_links' ) )
+                        wp_die( __( 'You do not have sufficient permissions to edit the links for this site.' ) );
+        }
+        function load_admin_page() {
+                $this->check_permissions();
+                wp_reset_vars( $this->reset_vars );
+                foreach ( $this->reset_vars as $_var )
+                        $$_var = $GLOBALS[$_var];
+                if ( ! empty( $_POST['linkcheck'] ) )
+                        $action = 'deletebookmarks';
+                if ( ! empty( $_POST['move'] ) )
+                        $action = 'move';
+                if ( ! empty( $_POST['linkcheck'] ) )
+                        $linkcheck = $_POST['linkcheck'];
+                $redirect_to = menu_page_url( 'link-manager.php', false );
+                switch ( $action ) {
+                        case 'deletebookmarks' :
+                                check_admin_referer( 'bulk-bookmarks' );
+                                //for each link id (in $linkcheck[]) change category to selected value
+                                if ( empty( $linkcheck ) ) {
+                                        wp_redirect( $redirect_to );
+                                        exit;
+                                }
+                                $deleted = 0;
+                                foreach ( $linkcheck as $link_id ) {
+                                        $link_id = (int) $link_id;
+                                        if ( wp_delete_link( $link_id ) )
+                                                $deleted++;
+                                }
+                                $redirect_to = add_query_arg( 'deleted', $deleted, $redirect_to );
+                                wp_redirect( $redirect_to );
+                                exit;
+                                break;
+                        case 'move' :
+                                check_admin_referer( 'bulk-bookmarks' );
+                                //for each link id (in $linkcheck[]) change category to selected value
+                                if ( empty( $linkcheck ) ) {
+                                        wp_redirect( $redirect_to );
+                                        exit;
+                                }
+                                $all_links = join( ',', $linkcheck );
+                                // should now have an array of links we can change
+                                //$q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)");
+                                wp_redirect( $redirect_to );
+                                exit;
+                                break;
+                        case 'add' :
+                                check_admin_referer( 'add-bookmark' );
+                                $redir = wp_get_referer();
+                                if ( add_link() )
+                                        $redir = add_query_arg( 'added', 'true', $redir );
+                                wp_redirect( $redir );
+                                exit;
+                                break;
+                        case 'save' :
+                                $link_id = (int) $link_id;
+                                check_admin_referer( 'update-bookmark_' . $link_id );
+                                edit_link( $link_id );
+                                wp_redirect( $redirect_to );
+                                exit;
+                                break;
+                        case 'delete' :
+                                $link_id = (int) $link_id;
+                                check_admin_referer( 'delete-bookmark_' . $link_id );
+                                wp_delete_link( $link_id );
+                                wp_redirect( $redirect_to );
+                                exit;
+                                break;
+                        case 'edit' :
+                                wp_enqueue_script( 'link' );
+                                wp_enqueue_script( 'xfn' );
+                                if ( wp_is_mobile() )
+                                        wp_enqueue_script( 'jquery-touch-punch' );
+                                $link_id = (int) $link_id;
+                                if ( !$link = get_link_to_edit( $link_id ) )
+                                        wp_die( __( 'Link not found.' ) );
+                                add_screen_option( 'layout_columns', array( 'max' => 2, 'default' => 2 ) );
+                                get_current_screen()->add_help_tab( array(
+                                        'id'      => 'overview',
+                                        'title'   => __('Overview'),
+                                        'content' =>
+                                        '<p>' . __( 'You can add or edit links on this screen by entering information in each of the boxes. Only the link&#8217;s web address and name (the text you want to display on your site as the link) are required fields.' ) . '</p>' .
+                                        '<p>' . __( 'The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don&#8217;t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '</p>' .
+                                        '<p>' . __( 'XFN stands for <a href="http://gmpg.org/xfn/" target="_blank">XHTML Friends Network</a>, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking.' ) . '</p>'
+                                ) );
+                                get_current_screen()->set_help_sidebar(
+                                        '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+                                        '<p>' . __( '<a href="http://codex.wordpress.org/Links_Add_New_Screen" target="_blank">Documentation on Creating Links</a>' ) . '</p>' .
+                                        '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+                                );
+                                break;
+                        default :
+                                require( LINK_MANAGER_DIR . '/admin/class-wp-links-list-table.php' );
+                                $this->wp_list_table = new WP_Links_List_Table();
+                                // Handle bulk deletes
+                                $doaction = $this->wp_list_table->current_action();
+                                if ( $doaction && isset( $_REQUEST['linkcheck'] ) ) {
+                                        check_admin_referer( 'bulk-bookmarks' );
+                                        if ( 'delete' == $doaction ) {
+                                                $bulklinks = (array) $_REQUEST['linkcheck'];
+                                                foreach ( $bulklinks as $link_id ) {
+                                                        $link_id = (int) $link_id;
+                                                        wp_delete_link( $link_id );
+                                                }
+                                                wp_redirect( add_query_arg( 'deleted', count( $bulklinks ), menu_page_url( 'link-manager.php', false ) ) );
+                                                exit;
+                                        }
+                                } elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
+                                        wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), stripslashes( $_SERVER['REQUEST_URI'] ) ) );
+                                        exit;
+                                }
+                                get_current_screen()->add_help_tab( array(
+                                'id'            => 'overview',
+                                'title'         => __('Overview'),
+                                'content'       =>
+                                        '<p>' . sprintf(__('You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in the WordPress community are included as examples.'), 'widgets.php') . '</p>' .
+                                        '<p>' . __('Links may be separated into Link Categories; these are different than the categories used on your posts.') . '</p>' .
+                                        '<p>' . __('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.') . '</p>'
+                                ) );
+                                get_current_screen()->add_help_tab( array(
+                                'id'            => 'deleting-links',
+                                'title'         => __('Deleting Links'),
+                                'content'       =>
+                                        '<p>' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.') . '</p>'
+                                ) );
+                                get_current_screen()->set_help_sidebar(
+                                        '<p><strong>' . __('For more information:') . '</strong></p>' .
+                                        '<p>' . __('<a href="http://codex.wordpress.org/Links_Screen" target="_blank">Documentation on Managing Links</a>') . '</p>' .
+                                        '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+                                );
+                                break;
+                }
+        }
+        function admin_page() {
+                global $link;
+                wp_reset_vars( $this->reset_vars );
+                foreach ( $this->reset_vars as $_var )
+                        $$_var = $GLOBALS[$_var];
+                $title = __( 'Links' );
+                if ( 'edit' === $action ) {
+                        $link = get_link_to_edit( $link_id );
+                        require( LINK_MANAGER_DIR . '/admin/meta-boxes.php' );
+                        include( LINK_MANAGER_DIR . '/admin/edit-link-form.php' );
+                } else {
+                        $wp_list_table =& $this->wp_list_table;
+                        $wp_list_table->prepare_items();
+                        include( LINK_MANAGER_DIR . '/admin/link-manager.php' );
+                }
+        }
+        function add_new_page() {
+                global $link;
+                $this->check_permissions();
+                wp_reset_vars( $this->reset_vars );
+                foreach ( $this->reset_vars as $_var )
+                        $$_var = $GLOBALS[$_var];
+                $title = __( 'Add New Link' );
+                $link = get_default_link_to_edit();
+                require( LINK_MANAGER_DIR . '/admin/meta-boxes.php' );
+                include( LINK_MANAGER_DIR . '/admin/edit-link-form.php' );
+        }
+        function load_add_new_page() {
+                wp_enqueue_script( 'link' );
+                wp_enqueue_script( 'xfn' );
+                if ( wp_is_mobile() )
+                        wp_enqueue_script( 'jquery-touch-punch' );
+        }
+        function admin_bar_menu() {
+                global $wp_admin_bar;
+                if ( current_user_can( 'manage_links' ) ) {
+                        $wp_admin_bar->add_menu( array(
+                                'parent'    => 'new-content',
+                                'id'        => 'new-link',
+                                'title'     => _x( 'Link', 'add new from admin bar' ),
+                                'href'      => admin_url( 'link-add.php' )
+                        ) );
+                }
+        }
+        function whitelist_options( $options ) {
+                $options['writing'][] = 'default_link_category';
+                return $options;
+        }
+        function terms_list_table_coumns( $columns ) {
+                global $taxonomy;
+                if ( 'link_category' === $taxonomy )
+                        $columns['links'] = __( 'Links' );
+                return $columns;
+        }
+        function dropdown_categories_args( $args ) {
+                // Back compat.
+                if ( isset( $args['type'] ) && 'link' == $args['type'] ) {
+                        _deprecated_argument( 'wp_dropdown_categories', '3.0', '' );
+                        $args['taxonomy'] = 'link_category';
+                }
+                return $args;
+        }
+        function get_categories_taxonomy( $taxonomy, $args ) {
+                // Back compat
+                if ( isset( $args['type'] ) && 'link' == $args['type'] ) {
+                        _deprecated_argument( 'get_categories', '3.0', '' );
+                        $args['taxonomy'] = 'link_category';
+                }
+                return $args['taxonomy'];
+        }
+        function sanitize_default_link_category( $value ) {
+                $value = absint( $value );
+                return $value;
+        }
+        function wpmu_delete_user( $id ) {
+                global $wpdb;
+                $blogs = get_blogs_of_user( $id );
+                if ( ! empty( $blogs ) ) {
+                        foreach ( $blogs as $blog ) {
+                                switch_to_blog( $blog->userblog_id );
+                                // Clean links
+                                $link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
+                                if ( $link_ids )
+                                        foreach ( $link_ids as $link_id )
+                                                wp_delete_link( $link_id );
+                        }
+                }
+        }
+        function delete_user( $id ) {
+                global $wpdb;
+                // Clean links
+                $link_ids = $wpdb->get_col( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id) );
+                if ( $link_ids ) {
+                        foreach ( $link_ids as $link_id )
+                                wp_delete_link( $link_id );
+                }
+        }
+        function reassign_user_data( $id, $reassign ) {
+                global $wpdb;
+                $wpdb->update( $wpdb->links, array( 'link_owner' => $reassign ), array( 'link_owner' => $id ) );
+        }
+        function edit_link_category_help() {
+                $help = '<p>' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '</p>';
+                $help .= '<p>' . __( 'You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '</p>';
+                get_current_screen()->add_help_tab( array(
+                        'id'      => 'overview',
+                        'title'   => __('Overview'),
+                        'content' => $help,
+                ) );
+                $help = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
+                $help .= '<p>' . __( '<a href="http://codex.wordpress.org/Links_Link_Categories_Screen" target="_blank">Documentation on Link Categories</a>' ) . '</p>';
+                $help .= '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>';
+                get_current_screen()->set_help_sidebar( $help );
+        }
+        /**
+        * Ajax Actions
+        *
+        */
+        function ajax_add_link_category( $action ) {
+                if ( empty( $action ) )
+                        $action = 'add-link-category';
+                check_ajax_referer( $action );
+                if ( !current_user_can( 'manage_categories' ) )
+                        wp_die( -1 );
+                $names = explode( ',', $_POST['newcat'] );
+                $x = new WP_Ajax_Response();
+                foreach ( $names as $cat_name ) {
+                        $cat_name = trim( $cat_name );
+                        $slug = sanitize_title( $cat_name );
+                        if ( '' === $slug )
+                                continue;
+                        if ( !$cat_id = term_exists( $cat_name, 'link_category' ) )
+                                $cat_id = wp_insert_term( $cat_name, 'link_category' );
+                        if ( is_wp_error( $cat_id ) )
+                                continue;
+                        else if ( is_array( $cat_id ) )
+                                $cat_id = $cat_id['term_id'];
+                        $cat_name = esc_html( stripslashes( $cat_name ) );
+                        $x->add( array(
+                                'what' => 'link-category',
+                                'id' => $cat_id,
+                                'data' => "<li id='link-category-$cat_id'><label for='in-link-category-$cat_id' class='selectit'><input value='" . esc_attr( $cat_id ) . "' type='checkbox' checked='checked' name='link_category[]' id='in-link-category-$cat_id'/> $cat_name</label></li>",
+                                'position' => -1
+                        ) );
+                }
+                $x->send();
+        }
+        function ajax_delete_link() {
+                $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
+                check_ajax_referer( "delete-bookmark_$id" );
+                if ( !current_user_can( 'manage_links' ) )
+                        wp_die( -1 );
+                $link = get_bookmark( $id );
+                if ( !$link || is_wp_error( $link ) )
+                        wp_die( 1 );
+                if ( wp_delete_link( $id ) )
+                        wp_die( 1 );
+                else
+                        wp_die( 0 );
+        }
+        function install_defaults() {
+                global $wpdb;
+                if ( get_option( 'default_links_added' ) )
+                        return;
+                // Default link category
+                $cat_name = __( 'Blogroll' );
+                /* translators: Default link category slug */
+                $cat_slug = sanitize_title( _x( 'Blogroll', 'Default link category slug' ) );
+                if ( global_terms_enabled() ) {
+                        $blogroll_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
+                        if ( $blogroll_id == null ) {
+                                $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time( 'mysql', true ) ) );
+                                $blogroll_id = $wpdb->insert_id;
+                        }
+                        update_option( 'default_link_category', $blogroll_id );
+                }
+                if ( empty( $blogroll_id ) )
+                        $blogroll_id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM {$wpdb->terms} WHERE name = %s AND slug = %s", $cat_name, $cat_slug ) );
+                if ( empty( $blogroll_id ) ) {
+                        $wpdb->insert( $wpdb->terms, array( 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0 ) );
+                        $blogroll_id = $wpdb->insert_id;
+                }
+                $wpdb->insert( $wpdb->term_taxonomy, array( 'term_id' => $blogroll_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 7 ) );
+                $blogroll_tt_id = $wpdb->insert_id;
+                // Now drop in some default links
+                $default_links = array();
+                $default_links[] = array(
+                        'link_url'      => __( 'http://codex.wordpress.org/' ),
+                        'link_name' => __( 'Documentation' ),
+                        'link_rss'      => '',
+                        'link_notes'=> ''
+                );
+                $default_links[] = array(
+                        'link_url'      => __( 'http://wordpress.org/news/' ),
+                        'link_name' => __( 'WordPress Blog' ),
+                        'link_rss'      => __( 'http://wordpress.org/news/feed/' ),
+                        'link_notes'=> ''
+                );
+                $default_links[] = array(
+                        'link_url'      => __( 'http://wordpress.org/support/' ),
+                        'link_name' => _x( 'Support Forums', 'default link' ),
+                        'link_rss'      => '',
+                        'link_notes'=>''
+                );
+                $default_links[] = array(
+                        'link_url'      => 'http://wordpress.org/extend/plugins/',
+                        'link_name' => _x( 'Plugins', 'Default link to wordpress.org/extend/plugins/' ),
+                        'link_rss'      => '',
+                        'link_notes'=>''
+                );
+                $default_links[] = array(
+                        'link_url'      => 'http://wordpress.org/extend/themes/',
+                        'link_name' => _x( 'Themes', 'Default link to wordpress.org/extend/themes/' ),
+                        'link_rss'      => '',
+                        'link_notes'=>''
+                );
+                $default_links[] = array(
+                        'link_url'      => __( 'http://wordpress.org/support/forum/requests-and-feedback' ),
+                        'link_name' => __( 'Feedback' ),
+                        'link_rss'      => '',
+                        'link_notes'=>''
+                );
+                $default_links[] = array(
+                        'link_url'      => __( 'http://planet.wordpress.org/' ),
+                        'link_name' => __( 'WordPress Planet' ),
+                        'link_rss'      => '',
+                        'link_notes'=>''
+                );
+                foreach ( $default_links as $link ) {
+                        $wpdb->insert( $wpdb->links, $link );
+                        $wpdb->insert( $wpdb->term_relationships, array( 'term_taxonomy_id' => $blogroll_tt_id, 'object_id' => $wpdb->insert_id ) );
+                }
+                update_option( 'default_links_added', 1 );
+        }
+        /**
+         * Back-compat actions
+         *
+         */
+        function backcompat_load_taxnow() {
+                global $taxnow;
+                if ( 'link_category' === $taxnow )
+                        do_action( 'load-edit-link-categories.php' );
+        }
+        function link_category_pre_add_form( $taxonomy ) {
+                do_action( 'add_link_category_form_pre', (object) array( 'parent' => 0 ) );
+        }
+        function link_category_add_form( $taxonomy ) {
+                do_action( 'edit_link_category_form', (object) array( 'parent' => 0 ) );
+        }
+        function link_category_pre_edit_form( $tag, $taxonomy ) {
+                do_action( 'edit_link_category_form_pre', $tag );
+        }
+        function link_category_edit_form_fields( $tag, $taxonomy ) {
+                do_action( 'edit_link_category_form_fields', $tag );
+        }
+        function link_category_edit_form( $tag, $taxonomy ) {
+                do_action( 'edit_link_category_form', $tag );
+        }
+}
+LinkManagerPlugin::get_instance();
+ No newline at end of file

wp-content/plugins/link-manager/bookmark.php

+<?php
+/**
+ * Link/Bookmark API
+ *
+ * @package Link Manager
+ * @subpackage Bookmark
+ */
+/**
+ * Retrieve Bookmark data
+ *
+ * @since WP 2.1.0
+ * @uses $wpdb Database Object
+ *
+ * @param mixed $bookmark
+ * @param string $output Optional. Either OBJECT, ARRAY_N, or ARRAY_A constant
+ * @param string $filter Optional, default is 'raw'.
+ * @return array|object Type returned depends on $output value.
+ */
+function get_bookmark( $bookmark, $output = OBJECT, $filter = 'raw' ) {
+        global $wpdb;
+        if ( empty( $bookmark ) ) {
+                if ( isset( $GLOBALS['link']) )
+                        $_bookmark = & $GLOBALS['link'];
+                else
+                        $_bookmark = null;
+        } elseif ( is_object( $bookmark ) ) {
+                wp_cache_add( $bookmark->link_id, $bookmark, 'bookmark' );
+                $_bookmark = $bookmark;
+        } else {
+                if ( isset( $GLOBALS['link']) && ( $GLOBALS['link']->link_id == $bookmark ) ) {
+                        $_bookmark = & $GLOBALS['link'];
+                } elseif ( ! $_bookmark = wp_cache_get( $bookmark, 'bookmark' ) ) {
+                        $_bookmark = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->links WHERE link_id = %d LIMIT 1", $bookmark ) );
+                        $_bookmark->link_category = array_unique( wp_get_object_terms( $_bookmark->link_id, 'link_category', array( 'fields' => 'ids' ) ) );
+                        wp_cache_add( $_bookmark->link_id, $_bookmark, 'bookmark' );
+                }
+        }
+        $_bookmark = sanitize_bookmark( $_bookmark, $filter );
+        if ( $output == OBJECT ) {
+                return $_bookmark;
+        } elseif ( $output == ARRAY_A ) {
+                return get_object_vars( $_bookmark );
+        } elseif ( $output == ARRAY_N ) {
+                return array_values(get_object_vars( $_bookmark ) );
+        } else {
+                return $_bookmark;
+        }
+}
+/**
+ * Retrieve single bookmark data item or field.
+ *
+ * @since WP 2.3.0
+ * @uses get_bookmark() Gets bookmark object using $bookmark as ID
+ * @uses sanitize_bookmark_field() Sanitizes Bookmark field based on $context.
+ *
+ * @param string $field The name of the data field to return
+ * @param int $bookmark The bookmark ID to get field
+ * @param string $context Optional. The context of how the field will be used.
+ * @return string
+ */
+function get_bookmark_field( $field, $bookmark, $context = 'display' ) {
+        $bookmark = (int) $bookmark;
+        $bookmark = get_bookmark( $bookmark );
+        if ( is_wp_error( $bookmark ) )
+                return $bookmark;
+        if ( !is_object( $bookmark ) )
+                return '';
+        if ( !isset( $bookmark->$field ) )
+                return '';
+        return sanitize_bookmark_field( $field, $bookmark->$field, $bookmark->link_id, $context );
+}
+/**
+ * Retrieves the list of bookmarks
+ *
+ * Attempts to retrieve from the cache first based on MD5 hash of arguments. If
+ * that fails, then the query will be built from the arguments and executed. The
+ * results will be stored to the cache.
+ *
+ * List of default arguments are as follows:
+ * 'orderby' - Default is 'name' (string). How to order the links by. String is
+ *              based off of the bookmark scheme.
+ * 'order' - Default is 'ASC' (string). Either 'ASC' or 'DESC'. Orders in either
+ *              ascending or descending order.
+ * 'limit' - Default is -1 (integer) or show all. The amount of bookmarks to
+ *              display.
+ * 'category' - Default is empty string (string). Include the links in what
+ *              category ID(s ).
+ * 'category_name' - Default is empty string (string). Get links by category
+ *              name.
+ * 'hide_invisible' - Default is 1 (integer). Whether to show (default) or hide
+ *              links marked as 'invisible'.
+ * 'show_updated' - Default is 0 (integer). Will show the time of when the
+ *              bookmark was last updated.
+ * 'include' - Default is empty string (string). Include bookmark ID(s )
+ *              separated by commas.
+ * 'exclude' - Default is empty string (string). Exclude bookmark ID(s )
+ *              separated by commas.
+ *
+ * @since WP 2.1.0
+ * @uses $wpdb Database Object
+ * @link http://codex.wordpress.org/Template_Tags/get_bookmarks
+ *
+ * @param string|array $args List of arguments to overwrite the defaults
+ * @return array List of bookmark row objects
+ */
+function get_bookmarks( $args = '' ) {
+        global $wpdb;
+        $defaults = array(
+                'orderby' => 'name', 'order' => 'ASC',
+                'limit' => -1, 'category' => '',
+                'category_name' => '', 'hide_invisible' => 1,
+                'show_updated' => 0, 'include' => '',
+                'exclude' => '', 'search' => ''
+        );
+        $r = wp_parse_args( $args, $defaults );
+        extract( $r, EXTR_SKIP );
+        $cache = array();
+        $key = md5( serialize( $r ) );
+        if ( $cache = wp_cache_get( 'get_bookmarks', 'bookmark' ) ) {
+                if ( is_array( $cache ) && isset( $cache[ $key ] ) )
+                        return apply_filters( 'get_bookmarks', $cache[ $key ], $r );
+        }
+        if ( !is_array( $cache ) )
+                $cache = array();
+        $inclusions = '';
+        if ( !empty( $include ) ) {
+                $exclude = '';  //ignore exclude, category, and category_name params if using include
+                $category = '';
+                $category_name = '';
+                $inclinks = preg_split( '/[\s,]+/',$include );
+                if ( count( $inclinks ) ) {
+                        foreach ( $inclinks as $inclink ) {
+                                if (empty( $inclusions ) )
+                                        $inclusions = ' AND ( link_id = ' . intval( $inclink ) . ' ';
+                                else
+                                        $inclusions .= ' OR link_id = ' . intval( $inclink ) . ' ';
+                        }
+                }
+        }
+        if (!empty( $inclusions ) )
+                $inclusions .= ' )';
+        $exclusions = '';
+        if ( !empty( $exclude ) ) {
+                $exlinks = preg_split( '/[\s,]+/',$exclude );
+                if ( count( $exlinks ) ) {
+                        foreach ( $exlinks as $exlink ) {
+                                if (empty( $exclusions ) )
+                                        $exclusions = ' AND ( link_id <> ' . intval( $exlink ) . ' ';
+                                else
+                                        $exclusions .= ' AND link_id <> ' . intval( $exlink ) . ' ';
+                        }
+                }
+        }
+        if (!empty( $exclusions ) )
+                $exclusions .= ' )';
+        if ( !empty( $category_name ) ) {
+                if ( $category = get_term_by( 'name', $category_name, 'link_category' ) ) {
+                        $category = $category->term_id;
+                } else {
+                        $cache[ $key ] = array();
+                        wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
+                        return apply_filters( 'get_bookmarks', array(), $r );
+                }
+        }
+        if ( ! empty( $search ) ) {
+                $search = like_escape( $search );
+                $search = " AND ( (link_url LIKE '%$search%' ) OR (link_name LIKE '%$search%' ) OR (link_description LIKE '%$search%' ) ) ";
+        }
+        $category_query = '';
+        $join = '';
+        if ( !empty( $category ) ) {
+                $incategories = preg_split( '/[\s,]+/',$category );
+                if ( count( $incategories ) ) {
+                        foreach ( $incategories as $incat ) {
+                                if (empty( $category_query ) )
+                                        $category_query = ' AND ( tt.term_id = ' . intval( $incat ) . ' ';
+                                else
+                                        $category_query .= ' OR tt.term_id = ' . intval( $incat ) . ' ';
+                        }
+                }
+        }
+        if (!empty( $category_query ) ) {
+                $category_query .= " ) AND taxonomy = 'link_category'";
+                $join = " INNER JOIN $wpdb->term_relationships AS tr ON ( $wpdb->links.link_id = tr.object_id) INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_taxonomy_id = tr.term_taxonomy_id";
+        }
+        if ( $show_updated && get_option( 'links_recently_updated_time' ) ) {
+                $recently_updated_test = ", IF (DATE_ADD(link_updated, INTERVAL " . get_option( 'links_recently_updated_time' ) . " MINUTe ) >= NOW(), 1,0) as recently_updated ";
+        } else {
+                $recently_updated_test = '';
+        }
+        $get_updated = ( $show_updated ) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : '';
+        $orderby = strtolower( $orderby );
+        $length = '';
+        switch ( $orderby ) {
+                case 'length':
+                        $length = ", CHAR_LENGTH(link_name ) AS length";
+                        break;
+                case 'rand':
+                        $orderby = 'rand()';
+                        break;
+                case 'link_id':
+                        $orderby = "$wpdb->links.link_id";
+                        break;
+                default:
+                        $orderparams = array();
+                        foreach ( explode( ',', $orderby ) as $ordparam ) {
+                                $ordparam = trim( $ordparam );
+                                $keys = array( 'link_id', 'link_name', 'link_url', 'link_visible', 'link_rating', 'link_owner', 'link_updated', 'link_notes' );
+                                if ( in_array( 'link_' . $ordparam, $keys ) )
+                                        $orderparams[] = 'link_' . $ordparam;
+                                elseif ( in_array( $ordparam, $keys ) )
+                                        $orderparams[] = $ordparam;
+                        }
+                        $orderby = implode( ',', $orderparams );
+        }
+        if ( empty( $orderby ) )
+                $orderby = 'link_name';
+        $order = strtoupper( $order );
+        if ( '' !== $order && !in_array( $order, array( 'ASC', 'DESC' ) ) )
+                $order = 'ASC';
+        $visible = '';
+        if ( $hide_invisible )
+                $visible = "AND link_visible = 'Y'";
+        $query = "SELECT * $length $recently_updated_test $get_updated FROM $wpdb->links $join WHERE 1=1 $visible $category_query";
+        $query .= " $exclusions $inclusions $search";
+        $query .= " ORDER BY $orderby $order";
+        if ( $limit != -1)
+                $query .= " LIMIT $limit";
+        $results = $wpdb->get_results( $query );
+        $cache[ $key ] = $results;
+        wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
+        return apply_filters( 'get_bookmarks', $results, $r );
+}
+/**
+ * Sanitizes all bookmark fields
+ *
+ * @since WP 2.3.0
+ *
+ * @param object|array $bookmark Bookmark row
+ * @param string $context Optional, default is 'display'. How to filter the
+ *              fields
+ * @return object|array Same type as $bookmark but with fields sanitized.
+ */
+function sanitize_bookmark( $bookmark, $context = 'display' ) {
+        $fields = array( 'link_id', 'link_url', 'link_name', 'link_image', 'link_target', 'link_category',
+                'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_updated',
+                'link_rel', 'link_notes', 'link_rss', );
+        if ( is_object( $bookmark ) ) {
+                $do_object = true;
+                $link_id = $bookmark->link_id;
+        } else {
+                $do_object = false;
+                $link_id = $bookmark['link_id'];
+        }
+        foreach ( $fields as $field ) {
+                if ( $do_object ) {
+                        if ( isset( $bookmark->$field ) )
+                                $bookmark->$field = sanitize_bookmark_field( $field, $bookmark->$field, $link_id, $context );
+                } else {
+                        if ( isset( $bookmark[$field]) )
+                                $bookmark[$field] = sanitize_bookmark_field( $field, $bookmark[$field], $link_id, $context );
+                }
+        }
+        return $bookmark;
+}
+/**
+ * Sanitizes a bookmark field
+ *
+ * Sanitizes the bookmark fields based on what the field name is. If the field
+ * has a strict value set, then it will be tested for that, else a more generic
+ * filtering is applied. After the more strict filter is applied, if the
+ * $context is 'raw' then the value is immediately return.
+ *
+ * Hooks exist for the more generic cases. With the 'edit' context, the
+ * 'edit_$field' filter will be called and passed the $value and $bookmark_id
+ * respectively. With the 'db' context, the 'pre_$field' filter is called and
+ * passed the value. The 'display' context is the final context and has the
+ * $field has the filter name and is passed the $value, $bookmark_id, and
+ * $context respectively.
+ *
+ * @since WP 2.3.0
+ *
+ * @param string $field The bookmark field
+ * @param mixed $value The bookmark field value
+ * @param int $bookmark_id Bookmark ID
+ * @param string $context How to filter the field value. Either 'raw', 'edit',
+ *              'attribute', 'js', 'db', or 'display'
+ * @return mixed The filtered value
+ */
+function sanitize_bookmark_field( $field, $value, $bookmark_id, $context ) {
+        switch ( $field ) {
+        case 'link_id' : // ints
+        case 'link_rating' :
+                $value = (int) $value;
+                break;
+        case 'link_category' : // array( ints )
+                $value = array_map( 'absint', (array) $value );
+                // We return here so that the categories aren't filtered.
+                // The 'link_category' filter is for the name of a link category, not an array of a link's link categories
+                return $value;
+                break;
+        case 'link_visible' : // bool stored as Y|N
+                $value = preg_replace( '/[^YNyn]/', '', $value );
+                break;
+        case 'link_target' : // "enum"
+                $targets = array( '_top', '_blank' );
+                if ( ! in_array( $value, $targets ) )
+                        $value = '';
+                break;
+        }
+        if ( 'raw' == $context )
+                return $value;
+        if ( 'edit' == $context ) {
+                $value = apply_filters( "edit_$field", $value, $bookmark_id );
+                if ( 'link_notes' == $field ) {
+                        $value = esc_html( $value ); // textarea_escaped
+                } else {
+                        $value = esc_attr( $value );
+                }
+        } else if ( 'db' == $context ) {
+                $value = apply_filters( "pre_$field", $value );
+        } else {
+                // Use display filters by default.
+                $value = apply_filters( $field, $value, $bookmark_id, $context );
+                if ( 'attribute' == $context )
+                        $value = esc_attr( $value );
+                else if ( 'js' == $context )
+                        $value = esc_js( $value );
+        }
+        return $value;
+}
+/**
+ * Deletes bookmark cache
+ *
+ * @since WP 2.7.0
+ * @uses wp_cache_delete() Deletes the contents of 'get_bookmarks'
+ */
+function clean_bookmark_cache( $bookmark_id ) {
+        wp_cache_delete( $bookmark_id, 'bookmark' );
+        wp_cache_delete( 'get_bookmarks', 'bookmark' );
+        clean_object_term_cache( $bookmark_id, 'link' );
+}

wp-content/plugins/link-manager/functions.php

+<?php
+/**
+ * Add sub menu page to the links main menu.
+ *
+ * This function takes a capability which will be used to determine whether
+ * or not a page is included in the menu.
+ *
+ * The function which is hooked in to handle the output of the page must check
+ * that the user has the required capability as well.
+ *
+ * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
+ * @param string $menu_title The text to be used for the menu
+ * @param string $capability The capability required for this menu to be displayed to the user.
+ * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu)
+ * @param callback $function The function to be called to output the content for this page.
+ *
+ * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required.
+ */
+function add_links_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
+        return add_submenu_page( 'link-manager.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+}
+/**
+ * Display edit bookmark (literally a URL external to blog) link anchor content.
+ *
+ * @since 2.7.0
+ *
+ * @param string $link Optional. Anchor text.
+ * @param string $before Optional. Display before edit link.
+ * @param string $after Optional. Display after edit link.
+ * @param int $bookmark Optional. Bookmark ID.
+ */
+function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark = null ) {
+        $bookmark = get_bookmark( $bookmark );
+        if ( !current_user_can('manage_links') )
+                return;
+        if ( empty($link) )
+                $link = __('Edit This');
+        $link = '<a href="' . get_edit_bookmark_link( $bookmark ) . '" title="' . esc_attr__( 'Edit Link' ) . '">' . $link . '</a>';
+        echo $before . apply_filters( 'edit_bookmark_link', $link, $bookmark->link_id ) . $after;
+}
+/**
+ * Display edit bookmark (literally a URL external to blog) link.
+ *
+ * @since 2.7.0
+ *
+ * @param int $link Optional. Bookmark ID.
+ * @return string
+ */
+function get_edit_bookmark_link( $link = 0 ) {
+        $link = get_bookmark( $link );
+        if ( !current_user_can('manage_links') )
+                return;
+        $menu_page_url = menu_page_url( 'link-manager.php', false );
+        $location = add_query_arg( array( 'action' => 'edit', 'link_id' => $link->link_id ), $menu_page_url );
+        return apply_filters( 'get_edit_bookmark_link', $location, $link->link_id );
+}
+/**
+ * Add a link to using values provided in $_POST.
+ *
+ * @since WP 2.0.0
+ *
+ * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
+ */
+function add_link() {
+        return edit_link();
+}
+/**
+ * Update or insert a link using values provided in $_POST.
+ *
+ * @since WP 2.0.0
+ *
+ * @param int $link_id Optional. ID of the link to edit.
+ * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
+ */
+function edit_link( $link_id = 0 ) {
+        if ( !current_user_can( 'manage_links' ) )
+                wp_die( __( 'Cheatin&#8217; uh?' ) );
+        $_POST['link_url'] = esc_html( $_POST['link_url'] );
+        $_POST['link_url'] = esc_url($_POST['link_url']);
+        $_POST['link_name'] = esc_html( $_POST['link_name'] );
+        $_POST['link_image'] = esc_html( $_POST['link_image'] );
+        $_POST['link_rss'] = esc_url( $_POST['link_rss'] );
+        if ( !isset($_POST['link_visible']) || 'N' != $_POST['link_visible'] )
+                $_POST['link_visible'] = 'Y';
+        if ( !empty( $link_id ) ) {
+                $_POST['link_id'] = $link_id;
+                return wp_update_link( $_POST );
+        } else {
+                return wp_insert_link( $_POST );
+        }
+}
+/**
+ * Retrieve the default link for editing.
+ *
+ * @since WP 2.0.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
+                $link->link_url = '';
+        if ( isset( $_GET['name'] ) )
+                $link->link_name = esc_attr( $_GET['name'] );
+        else
+                $link->link_name = '';
+        $link->link_visible = 'Y';
+        return $link;
+}
+/**
+ * Delete link specified from database
+ *
+ * @since WP 2.0.0
+ *
+ * @param int $link_id ID of the link to delete
+ * @return bool True
+ */
+function wp_delete_link( $link_id ) {
+        global $wpdb;
+        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( 'deleted_link', $link_id );
+        clean_bookmark_cache( $link_id );
+        return true;
+}
+/**
+ * Retrieves the link categories associated with the link specified.
+ *
+ * @since WP 2.1.0
+ *
+ * @param int $link_id Link ID to look up
+ * @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' ) );
+        return array_unique( $cats );
+}
+/**
+ * Retrieve link data based on ID.
+ *
+ * @since WP 2.0.0
+ *
+ * @param int $link_id ID of link to retrieve
+ * @return object Link for editing
+ */
+function get_link_to_edit( $link_id ) {
+        return get_bookmark( $link_id, OBJECT, 'edit' );
+}
+/**
+ * This function inserts/updates links into/in the database.
+ *
+ * @since WP 2.0.0
+ *
+ * @param array $linkdata Elements that make up the link to insert.
+ * @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 ) {
+        global $wpdb;
+        $defaults = array( 'link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0 );
+        $linkdata = wp_parse_args( $linkdata, $defaults );
+        $linkdata = sanitize_bookmark( $linkdata, 'db' );
+        extract( stripslashes_deep( $linkdata ), EXTR_SKIP );
+        $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;
+        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 = '';
+        // Make sure we set a valid category
+        if ( ! isset( $link_category ) || 0 == count( $link_category ) || !is_array( $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 )
+                do_action( 'edit_link', $link_id );
+        else
+                do_action( 'add_link', $link_id );
+        clean_bookmark_cache( $link_id );
+        return $link_id;
+}
+/**
+ * Update link with the specified link categories.
+ *
+ * @since WP 2.1.0
+ *
+ * @param int $link_id ID of link to update
+ * @param array $link_categories Array of categories 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 );
+}
+/**
+ * Update a link in the database.
+ *
+ * @since WP 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 = add_magic_quotes( $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 );
+}
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.5.1
+ *
+ * @param unknown_type $link_id
+ */
+function wp_link_category_checklist( $link_id = 0 ) {
+        $default = 1;
+        if ( $link_id ) {
+                $checked_categories = wp_get_link_cats( $link_id );
+                // No selected categories, strange
+                if ( ! count( $checked_categories ) )
+                        $checked_categories[] = $default;
+        } else {
+                $checked_categories[] = $default;
+        }
+        $categories = get_terms( 'link_category', array( 'orderby' => 'name', 'hide_empty' => 0 ) );
+        if ( empty( $categories ) )
+                return;
+        foreach ( $categories as $category ) {
+                $cat_id = $category->term_id;
+                $name = esc_html( apply_filters( 'the_category', $category->name ) );
+                $checked = in_array( $cat_id, $checked_categories ) ? ' checked="checked"' : '';
+                echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', $checked, '/> ', $name, "</label></li>";
+        }
+}
+ No newline at end of file

wp-settings.php

 require( ABSPATH . WPINC . '/comment-template.php' );
 require( ABSPATH . WPINC . '/rewrite.php' );
 require( ABSPATH . WPINC . '/feed.php' );
-require( ABSPATH . WPINC . '/bookmark.php' );
-require( ABSPATH . WPINC . '/bookmark-template.php' );
 require( ABSPATH . WPINC . '/kses.php' );
 require( ABSPATH . WPINC . '/cron.php' );
 require( ABSPATH . WPINC . '/deprecated.php' );

wp-admin/users.php

         ?>
         </ul>
 <?php if ( $go_delete ) : ?>
         <fieldset><p><legend><?php echo _n( 'What should be done with posts and links owned by this user?', 'What should be done with posts and links owned by these users?', $go_delete ); ?></legend></p>
+        <fieldset><p><legend><?php echo _n( 'What should be done with posts owned by this user?', 'What should be done with posts owned by these users?', $go_delete ); ?></legend></p>
         <ul style="list-style:none;">
                 <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" checked="checked" />
                 <?php _e('Delete all posts and links.'); ?></label></li>
+                <?php _e('Delete all posts.'); ?></label></li>
                 <li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
                 <?php echo '<label for="delete_option1">'.__('Attribute all posts and links to:').'</label>';
+                <?php echo '<label for="delete_option1">'.__('Attribute all posts to:').'</label>';
                 wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
         </ul></fieldset>
         <input type="hidden" name="action" value="dodelete" />

wp-admin/admin-ajax.php

 );
 $core_actions_post = array(
         'oembed-cache', 'image-editor', 'delete-comment', 'delete-tag', 'delete-link',
+        'oembed-cache', 'image-editor', 'delete-comment', 'delete-tag',
         'delete-meta', 'delete-post', 'trash-post', 'untrash-post', 'delete-page', 'dim-comment',
         'add-link-category', 'add-tag', 'get-tagcloud', 'get-comments', 'replyto-comment',
+        'add-tag', 'get-tagcloud', 'get-comments', 'replyto-comment',
         'edit-comment', 'add-menu-item', 'add-meta', 'add-user', 'autosave', 'closed-postboxes',
         'hidden-columns', 'update-welcome-panel', 'menu-get-metabox', 'wp-link-ajax',
         'menu-locations-save', 'menu-quick-search', 'meta-box-order', 'get-permalink',

wp-admin/includes/plugin.php

+}
 /**
- * Add sub menu page to the links main menu.
+ *
- * This function takes a capability which will be used to determine whether
- * or not a page is included in the menu.
+ *
- * The function which is hooked in to handle the output of the page must check
- * that the user has the required capability as well.
+ *
- * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
- * @param string $menu_title The text to be used for the menu
- * @param string $capability The capability required for this menu to be displayed to the user.
- * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu)
- * @param callback $function The function to be called to output the content for this page.
+ *
- * @return string|bool The resulting page's hook_suffix, or false if the user does not have the capability required.
- */
-function add_links_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-        return add_submenu_page( 'link-manager.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+}
-/**
  * Add sub menu page to the pages main menu.
+ *
  * This function takes a capability which will be used to determine whether

wp-admin/includes/list-table.php

                 'WP_Users_List_Table' => 'users',
                 'WP_Comments_List_Table' => 'comments',
                 'WP_Post_Comments_List_Table' => 'comments',
-                'WP_Links_List_Table' => 'links',
                 'WP_Plugin_Install_List_Table' => 'plugin-install',
                 'WP_Themes_List_Table' => 'themes',
                 'WP_Theme_Install_List_Table' => array( 'themes', 'theme-install' ),

wp-admin/includes/bookmark.php

-<?php
-/**
- * WordPress Bookmark Administration API
+ *
- * @package WordPress
- * @subpackage Administration
- */
-/**
- * Add a link to using values provided in $_POST.
+ *
- * @since 2.0.0
+ *
- * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
- */
-function add_link() {
-        return edit_link();
+}
-/**
- * Update or insert a link using values provided in $_POST.
+ *
- * @since 2.0.0
+ *
- * @param int $link_id Optional. ID of the link to edit.
- * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
- */
-function edit_link( $link_id = 0 ) {
-        if ( !current_user_can( 'manage_links' ) )
-                wp_die( __( 'Cheatin&#8217; uh?' ) );
-        $_POST['link_url'] = esc_html( $_POST['link_url'] );
-        $_POST['link_url'] = esc_url($_POST['link_url']);
-        $_POST['link_name'] = esc_html( $_POST['link_name'] );
-        $_POST['link_image'] = esc_html( $_POST['link_image'] );
-        $_POST['link_rss'] = esc_url($_POST['link_rss']);
-        if ( !isset($_POST['link_visible']) || 'N' != $_POST['link_visible'] )
-                $_POST['link_visible'] = 'Y';
-        if ( !empty( $link_id ) ) {
-                $_POST['link_id'] = $link_id;
-                return wp_update_link( $_POST );
-        } else {
-                return wp_insert_link( $_POST );
+        }
+}
-/**
- * Retrieve the default link for editing.
+ *
- * @since 2.0.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
-                $link->link_url = '';
-        if ( isset( $_GET['name'] ) )
-                $link->link_name = esc_attr( $_GET['name'] );
-        else
-                $link->link_name = '';
-        $link->link_visible = 'Y';
-        return $link;
+}
-/**
- * Delete link specified from database
+ *
- * @since 2.0.0
+ *
- * @param int $link_id ID of the link to delete
- * @return bool True
- */
-function wp_delete_link( $link_id ) {
-        global $wpdb;
-        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( 'deleted_link', $link_id );
-        clean_bookmark_cache( $link_id );
-        return true;
+}
-/**
- * Retrieves the link categories associated with the link specified.
+ *
- * @since 2.1.0
+ *
- * @param int $link_id Link ID to look up
- * @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') );
-        return array_unique( $cats );
+}
-/**
- * Retrieve link data based on ID.
+ *
- * @since 2.0.0
+ *
- * @param int $link_id ID of link to retrieve
- * @return object Link for editing
- */
-function get_link_to_edit( $link_id ) {
-        return get_bookmark( $link_id, OBJECT, 'edit' );
+}
-/**
- * This function inserts/updates links into/in the database.
+ *
- * @since 2.0.0
+ *
- * @param array $linkdata Elements that make up the link to insert.
- * @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 ) {
-        global $wpdb;
-        $defaults = array( 'link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0 );
-        $linkdata = wp_parse_args( $linkdata, $defaults );
-        $linkdata = sanitize_bookmark( $linkdata, 'db' );
-        extract( stripslashes_deep( $linkdata ), EXTR_SKIP );
-        $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;
-        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 = '';
-        // Make sure we set a valid category
-        if ( ! isset( $link_category ) || 0 == count( $link_category ) || !is_array( $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 )
-                do_action( 'edit_link', $link_id );
-        else
-                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 link to update
- * @param array $link_categories Array of categories 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 );
+}
-/**
- * Update 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 = add_magic_quotes( $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 );
+}

wp-admin/includes/class-wp-links-list-table.php

-<?php
-/**
- * Links Manager List Table class.
+ *
- * @package WordPress
- * @subpackage List_Table
- * @since 3.1.0
- * @access private
- */
-class WP_Links_List_Table extends WP_List_Table {
-        function __construct() {
-                parent::__construct( array(
-                        'plural' => 'bookmarks',
-                ) );
+        }
-        function ajax_user_can() {
-                return current_user_can( 'manage_links' );
+        }
-        function prepare_items() {
-                global $cat_id, $s, $orderby, $order;
-                wp_reset_vars( array( 'action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'orderby', 'order', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]', 's' ) );
-                $args = array( 'hide_invisible' => 0, 'hide_empty' => 0 );
-                if ( 'all' != $cat_id )
-                        $args['category'] = $cat_id;
-                if ( !empty( $s ) )
-                        $args['search'] = $s;
-                if ( !empty( $orderby ) )
-                        $args['orderby'] = $orderby;
-                if ( !empty( $order ) )
-                        $args['order'] = $order;
-                $this->items = get_bookmarks( $args );
+        }
-        function no_items() {
-                _e( 'No links found.' );
+        }
-        function get_bulk_actions() {
-                $actions = array();
-                $actions['delete'] = __( 'Delete' );
-                return $actions;
+        }
-        function extra_tablenav( $which ) {
-                global $cat_id;
-                if ( 'top' != $which )
-                        return;
-?>
-                <div class="alignleft actions">
-<?php
-                        $dropdown_options = array(
-                                'selected' => $cat_id,
-                                'name' => 'cat_id',
-                                'taxonomy' => 'link_category',
-                                'show_option_all' => __( 'View all categories' ),
-                                'hide_empty' => true,
-                                'hierarchical' => 1,
-                                'show_count' => 0,
-                                'orderby' => 'name',
-                        );
-                        wp_dropdown_categories( $dropdown_options );
-                        submit_button( __( 'Filter' ), 'secondary', false, false, array( 'id' => 'post-query-submit' ) );
-?>
-                </div>
-<?php
+        }
-        function get_columns() {
-                return array(
-                        'cb'         => '<input type="checkbox" />',
-                        'name'       => _x( 'Name', 'link name' ),
-                        'url'        => __( 'URL' ),
-                        'categories' => __( 'Categories' ),
-                        'rel'        => __( 'Relationship' ),
-                        'visible'    => __( 'Visible' ),
-                        'rating'     => __( 'Rating' )
-                );
+        }
-        function get_sortable_columns() {
-                return array(
-                        'name'    => 'name',
-                        'url'     => 'url',
-                        'visible' => 'visible',
-                        'rating'  => 'rating'
-                );
+        }
-        function display_rows() {
-                global $cat_id;
-                $alt = 0;
-                foreach ( $this->items as $link ) {
-                        $link = sanitize_bookmark( $link );
-                        $link->link_name = esc_attr( $link->link_name );
-                        $link->link_category = wp_get_link_cats( $link->link_id );
-                        $short_url = url_shorten( $link->link_url );
-                        $visible = ( $link->link_visible == 'Y' ) ? __( 'Yes' ) : __( 'No' );
-                        $rating  = $link->link_rating;
-                        $style = ( $alt++ % 2 ) ? '' : ' class="alternate"';
-                        $edit_link = get_edit_bookmark_link( $link );
-?>
-                <tr id="link-<?php echo $link->link_id; ?>" valign="middle" <?php echo $style; ?>>
-<?php
-                        list( $columns, $hidden ) = $this->get_column_info();
-                        foreach ( $columns as $column_name => $column_display_name ) {
-                                $class = "class='column-$column_name'";
-                                $style = '';
-                                if ( in_array( $column_name, $hidden ) )
-                                        $style = ' style="display:none;"';
-                                $attributes = $class . $style;
-                                switch ( $column_name ) {
-                                        case 'cb': ?>
-                                                <th scope="row" class="check-column">
-                                                        <label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>"><?php echo sprintf( __( 'Select %s' ), $link->link_name ); ?></label>
-                                                        <input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr( $link->link_id ); ?>" />
-                                                </th>
-                                                <?php
-                                                break;
-                                        case 'name':
-                                                echo "<td $attributes><strong><a class='row-title' href='$edit_link' title='" . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $link->link_name ) ) . "'>$link->link_name</a></strong><br />";
-                                                $actions = array();
-                                                $actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
-                                                $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id ) . "' onclick=\"if ( confirm( '" . esc_js( sprintf( __( "You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete." ), $link->link_name ) ) . "' ) ) { return true;}return false;\">" . __( 'Delete' ) . "</a>";
-                                                echo $this->row_actions( $actions );
-                                                echo '</td>';
-                                                break;
-                                        case 'url':
-                                                echo "<td $attributes><a href='$link->link_url' title='". esc_attr( sprintf( __( 'Visit %s' ), $link->link_name ) )."'>$short_url</a></td>";
-                                                break;
-                                        case 'categories':
-                                                ?><td <?php echo $attributes ?>><?php
-                                                $cat_names = array();
-                                                foreach ( $link->link_category as $category ) {
-                                                        $cat = get_term( $category, 'link_category', OBJECT, 'display' );
-                                                        if ( is_wp_error( $cat ) )
-                                                                echo $cat->get_error_message();
-                                                        $cat_name = $cat->name;
-                                                        if ( $cat_id != $category )
-                                                                $cat_name = "<a href='link-manager.php?cat_id=$category'>$cat_name</a>";
-                                                        $cat_names[] = $cat_name;
+                                                }
-                                                echo implode( ', ', $cat_names );
-                                                ?></td><?php
-                                                break;
-                                        case 'rel':
-                                                ?><td <?php echo $attributes ?>><?php echo empty( $link->link_rel ) ? '<br />' : $link->link_rel; ?></td><?php
-                                                break;
-                                        case 'visible':
-                                                ?><td <?php echo $attributes ?>><?php echo $visible; ?></td><?php
-                                                break;
-                                        case 'rating':
-                                                ?><td <?php echo $attributes ?>><?php echo $rating; ?></td><?php
-                                                break;
-                                        default:
-                                                ?>
-                                                <td <?php echo $attributes ?>><?php do_action( 'manage_link_custom_column', $column_name, $link->link_id ); ?></td>
-                                                <?php
-                                                break;
+                                }
+                        }
-?>
-                </tr>
-<?php
+                }
+        }
+}

wp-admin/includes/class-wp-terms-list-table.php

                         'slug'        => __( 'Slug' ),
                 );
+                if ( 'link_category' == $taxonomy ) {
+                        $columns['links'] = __( 'Links' );
+                } else {
+                if ( $post_type ) {
                         $post_type_object = get_post_type_object( $post_type );
                         $columns['posts'] = $post_type_object ? $post_type_object->labels->name : __( 'Posts' );
+                }
+                $columns = apply_filters( 'terms_list_table_columns', $columns );
                 return $columns;
+        }

wp-admin/includes/ajax-actions.php

                 wp_die( 0 );
+}
-function wp_ajax_delete_link() {
-        $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
-        check_ajax_referer( "delete-bookmark_$id" );
-        if ( !current_user_can( 'manage_links' ) )
-                wp_die( -1 );
-        $link = get_bookmark( $id );
-        if ( !$link || is_wp_error( $link ) )
-                wp_die( 1 );
-        if ( wp_delete_link( $id ) )
-                wp_die( 1 );
-        else
-                wp_die( 0 );
+}
 function wp_ajax_delete_meta() {
         $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 …
         wp_die( 0 );
+}
-function wp_ajax_add_link_category( $action ) {
-        if ( empty( $action ) )
-                $action = 'add-link-category';
-        check_ajax_referer( $action );
-        if ( !current_user_can( 'manage_categories' ) )
-                wp_die( -1 );
-        $names = explode(',', $_POST['newcat']);
-        $x = new WP_Ajax_Response();
-        foreach ( $names as $cat_name ) {
-                $cat_name = trim($cat_name);
-                $slug = sanitize_title($cat_name);
-                if ( '' === $slug )
-                        continue;
-                if ( !$cat_id = term_exists( $cat_name, 'link_category' ) )
-                        $cat_id = wp_insert_term( $cat_name, 'link_category' );
-                if ( is_wp_error( $cat_id ) )
-                        continue;
-                else if ( is_array( $cat_id ) )
-                        $cat_id = $cat_id['term_id'];
-                $cat_name = esc_html(stripslashes($cat_name));
-                $x->add( array(
-                        'what' => 'link-category',
-                        'id' => $cat_id,
-                        'data' => "<li id='link-category-$cat_id'><label for='in-link-category-$cat_id' class='selectit'><input value='" . esc_attr($cat_id) . "' type='checkbox' checked='checked' name='link_category[]' id='in-link-category-$cat_id'/> $cat_name</label></li>",
-                        'position' => -1
-                ) );
+        }
-        $x->send();
+}
 function wp_ajax_add_tag() {
         global $wp_list_table;

wp-admin/includes/upgrade.php

         $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $cat_id, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
         $cat_tt_id = $wpdb->insert_id;
-        // Default link category
-        $cat_name = __('Blogroll');
-        /* translators: Default link category slug */
-        $cat_slug = sanitize_title(_x('Blogroll', 'Default link category slug'));
-        if ( global_terms_enabled() ) {
-                $blogroll_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
-                if ( $blogroll_id == null ) {
-                        $wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
-                        $blogroll_id = $wpdb->insert_id;
+                }
-                update_option('default_link_category', $blogroll_id);
-        } else {
-                $blogroll_id = 2;
+        }
-        $wpdb->insert( $wpdb->terms, array('term_id' => $blogroll_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
-        $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $blogroll_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 7));
-        $blogroll_tt_id = $wpdb->insert_id;
-        // Now drop in some default links
-        $default_links = array();
-        $default_links[] = array(       'link_url' => __( 'http://codex.wordpress.org/' ),
-                                                                'link_name' => __( 'Documentation' ),
-                                                                'link_rss' => '',
-                                                                'link_notes' => '');
-        $default_links[] = array(       'link_url' => __( 'http://wordpress.org/news/' ),
-                                                                'link_name' => __( 'WordPress Blog' ),
-                                                                'link_rss' => __( 'http://wordpress.org/news/feed/' ),
-                                                                'link_notes' => '');
-        $default_links[] = array(       'link_url' => __( 'http://wordpress.org/support/' ),
-                                                                'link_name' => _x( 'Support Forums', 'default link' ),
-                                                                'link_rss' => '',
-                                                                'link_notes' =>'');
-        $default_links[] = array(       'link_url' => 'http://wordpress.org/extend/plugins/',
-                                                                'link_name' => _x( 'Plugins', 'Default link to wordpress.org/extend/plugins/' ),
-                                                                'link_rss' => '',
-                                                                'link_notes' =>'');
-        $default_links[] = array(       'link_url' => 'http://wordpress.org/extend/themes/',
-                                                                'link_name' => _x( 'Themes', 'Default link to wordpress.org/extend/themes/' ),
-                                                                'link_rss' => '',
-                                                                'link_notes' =>'');
-        $default_links[] = array(       'link_url' => __( 'http://wordpress.org/support/forum/requests-and-feedback' ),
-                                                                'link_name' => __( 'Feedback' ),
-                                                                'link_rss' => '',
-                                                                'link_notes' =>'');
-        $default_links[] = array(       'link_url' => __( 'http://planet.wordpress.org/' ),
-                                                                'link_name' => __( 'WordPress Planet' ),
-                                                                'link_rss' => '',
-                                                                'link_notes' =>'');
-        foreach ( $default_links as $link ) {
-                $wpdb->insert( $wpdb->links, $link);
-                $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $blogroll_tt_id, 'object_id' => $wpdb->insert_id) );
+        }
         // First post
         $now = date('Y-m-d H:i:s');
         $now_gmt = gmdate('Y-m-d H:i:s');
 …
                 if ( !is_super_admin( $user_id ) && $user_id != 1 )
                         $wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+        }
+        do_action( 'install_defaults' );
+}
 endif;

wp-admin/includes/admin.php

         load_textdomain( 'default', WP_LANG_DIR . '/admin-' . get_locale() . '.mo' );
+}
-/** WordPress Bookmark Administration API */
-require_once(ABSPATH . 'wp-admin/includes/bookmark.php');
 /** WordPress Comment Administration API */
 require_once(ABSPATH . 'wp-admin/includes/comment.php');

wp-admin/includes/deprecated.php

 /**
  * {@internal Missing Short Description}}
+ *
- * @since 2.1.0
- * @deprecated 2.6.0
- * @deprecated Use wp_link_category_checklist()
- * @see wp_link_category_checklist()
+ *
- * @param unknown_type $default
- */
-function dropdown_link_categories( $default = 0 ) {
-        _deprecated_function( __FUNCTION__, '2.6', 'wp_link_category_checklist()' );
-        global $link_id;
-        wp_link_category_checklist( $link_id );
+}
-/**
- * {@internal Missing Short Description}}
+ *
  * @since 1.2.0
  * @deprecated 3.0.0
  * @deprecated Use wp_dropdown_categories()

wp-admin/includes/meta-boxes.php

 <?php
+}
-// -- Link related Meta Boxes
 /**
- * Display link create form fields.
+ *
- * @since 2.7.0
+ *
- * @param object $link
- */
-function link_submit_meta_box($link) {
-?>
-<div class="submitbox" id="submitlink">
-<div id="minor-publishing">
-<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
-<div style="display:none;">
-<?php submit_button( __( 'Save' ), 'button', 'save', false ); ?>
-</div>
-<div id="minor-publishing-actions">
-<div id="preview-action">
-<?php if ( !empty($link->link_id) ) { ?>
-        <a class="preview button" href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a>
-<?php } ?>
-</div>
-<div class="clear"></div>
-</div>
-<div id="misc-publishing-actions">
-<div class="misc-pub-section">
-        <label for="link_private" class="selectit"><input id="link_private" name="link_visible" type="checkbox" value="N" <?php checked($link->link_visible, 'N'); ?> /> <?php _e('Keep this link private') ?></label>
-</div>
-</div>
-</div>
-<div id="major-publishing-actions">
-<?php do_action('post_submitbox_start'); ?>
-<div id="delete-action">
-<?php
-if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links') ) { ?>
-        <a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo esc_js(sprintf(__("You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
-<?php } ?>
-</div>
-<div id="publishing-action">
-<?php if ( !empty($link->link_id) ) { ?>
-        <input name="save" type="submit" class="button-primary" id="publish" accesskey="p" value="<?php esc_attr_e('Update Link') ?>" />
-<?php } else { ?>
-        <input name="save" type="submit" class="button-primary" id="publish" accesskey="p" value="<?php esc_attr_e('Add Link') ?>" />
-<?php } ?>
-</div>
-<div class="clear"></div>
-</div>
-<?php do_action('submitlink_box'); ?>
-<div class="clear"></div>
-</div>
-<?php
+}
-/**
- * Display link categories form fields.
+ *
- * @since 2.6.0
+ *
- * @param object $link
- */
-function link_categories_meta_box($link) {
-?>
-<div id="taxonomy-linkcategory" class="categorydiv">
-        <ul id="category-tabs" class="category-tabs">
-                <li class="tabs"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
-                <li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
-        </ul>
-        <div id="categories-all" class="tabs-panel">
-                <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
-                        <?php
-                        if ( isset($link->link_id) )
-                                wp_link_category_checklist($link->link_id);
-                        else
-                                wp_link_category_checklist();
-                        ?>
-                </ul>
-        </div>
-        <div id="categories-pop" class="tabs-panel" style="display: none;">
-                <ul id="categorychecklist-pop" class="categorychecklist form-no-clear">
-                        <?php wp_popular_terms_checklist('link_category'); ?>
-                </ul>
-        </div>
-        <div id="category-adder" class="wp-hidden-children">
-                <h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
-                <p id="link-category-add" class="wp-hidden-child">
-                        <label class="screen-reader-text" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
-                        <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" aria-required="true" />
-                        <input type="button" id="category-add-submit" class="add:categorychecklist:linkcategorydiv button" value="<?php esc_attr_e( 'Add' ); ?>" />
-                        <?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
-                        <span id="category-ajax-response"></span>
-                </p>
-        </div>
-</div>
-<?php
+}
-/**
- * Display form fields for changing link target.
+ *
- * @since 2.6.0
+ *
- * @param object $link
- */
-function link_target_meta_box($link) { ?>
-<fieldset><legend class="screen-reader-text"><span><?php _e('Target') ?></span></legend>
-<p><label for="link_target_blank" class="selectit">
-<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
-<?php _e('<code>_blank</code> &mdash; new window or tab.'); ?></label></p>
-<p><label for="link_target_top" class="selectit">
-<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
-<?php _e('<code>_top</code> &mdash; current window or tab, with no frames.'); ?></label></p>
-<p><label for="link_target_none" class="selectit">
-<input id="link_target_none" type="radio" name="link_target" value="" <?php echo ( isset( $link->link_target ) && ($link->link_target == '') ? 'checked="checked"' : ''); ?> />
-<?php _e('<code>_none</code> &mdash; same window or tab.'); ?></label></p>
-</fieldset>
-<p><?php _e('Choose the target frame for your link.'); ?></p>
-<?php
+}
-/**
- * Display checked checkboxes attribute for xfn microformat options.
+ *
- * @since 1.0.1
+ *
- * @param string $class
- * @param string $value
- * @param mixed $deprecated Never used.
- */
-function xfn_check( $class, $value = '', $deprecated = '' ) {
-        global $link;
-        if ( !empty( $deprecated ) )
-                _deprecated_argument( __FUNCTION__, '0.0' ); // Never implemented
-        $link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
-        $rels = preg_split('/\s+/', $link_rel);
-        if ('' != $value && in_array($value, $rels) ) {
-                echo ' checked="checked"';
+        }
-        if ('' == $value) {
-                if ('family' == $class && strpos($link_rel, 'child') === false && strpos($link_rel, 'parent') === false && strpos($link_rel, 'sibling') === false && strpos($link_rel, 'spouse') === false && strpos($link_rel, 'kin') === false) echo ' checked="checked"';
-                if ('friendship' == $class && strpos($link_rel, 'friend') === false && strpos($link_rel, 'acquaintance') === false && strpos($link_rel, 'contact') === false) echo ' checked="checked"';
-                if ('geographical' == $class && strpos($link_rel, 'co-resident') === false && strpos($link_rel, 'neighbor') === false) echo ' checked="checked"';
-                if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"';
+        }
+}
-/**
- * Display xfn form fields.
+ *
- * @since 2.6.0
+ *
- * @param object $link
- */
-function link_xfn_meta_box($link) {
-?>
-<table class="links-table" cellspacing="0">
-        <tr>
-                <th scope="row"><label for="link_rel"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('rel:') ?></label></th>
-                <td><input type="text" name="link_rel" id="link_rel" value="<?php echo ( isset( $link->link_rel ) ? esc_attr($link->link_rel) : ''); ?>" /></td>
-        </tr>
-        <tr>
-                <th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?></th>
-                <td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?></span></legend>
-                        <label for="me">
-                        <input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> />
-                        <?php _e('another web address of mine') ?></label>
-                </fieldset></td>
-        </tr>
-        <tr>
-                <th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?></th>
-                <td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?></span></legend>
-                        <label for="contact">
-                        <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('contact') ?>
-                        </label>
-                        <label for="acquaintance">
-                        <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('acquaintance') ?>
-                        </label>
-                        <label for="friend">
-                        <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friend') ?>
-                        </label>
-                        <label for="friendship">
-                        <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?>
-                        </label>
-                </fieldset></td>
-        </tr>
-        <tr>
-                <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('physical') ?> </th>
-                <td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('physical') ?></span></legend>
-                        <label for="met">
-                        <input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('met') ?>
-                        </label>
-                </fieldset></td>
-        </tr>
-        <tr>
-                <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('professional') ?> </th>
-                <td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('professional') ?></span></legend>
-                        <label for="co-worker">
-                        <input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('co-worker') ?>
-                        </label>
-                        <label for="colleague">
-                        <input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('colleague') ?>
-                        </label>
-                </fieldset></td>
-        </tr>
-        <tr>
-                <th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?></th>
-                <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?> </span></legend>
-                        <label for="co-resident">
-                        <input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('co-resident') ?>
-                        </label>
-                        <label for="neighbor">
-                        <input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check('geographical', 'neighbor'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('neighbor') ?>
-                        </label>
-                        <label for="geographical">
-                        <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?>
-                        </label>
-                </fieldset></td>
-        </tr>
-        <tr>
-                <th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?></th>
-                <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </span></legend>
-                        <label for="child">
-                        <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('child') ?>
-                        </label>
-                        <label for="kin">
-                        <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('kin') ?>
-                        </label>
-                        <label for="parent">
-                        <input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('parent') ?>
-                        </label>
-                        <label for="sibling">
-                        <input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check('family', 'sibling'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('sibling') ?>
-                        </label>
-                        <label for="spouse">
-                        <input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check('family', 'spouse'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('spouse') ?>
-                        </label>
-                        <label for="family">
-                        <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?>
-                        </label>
-                </fieldset></td>
-        </tr>
-        <tr>
-                <th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('romantic') ?></th>
-                <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('romantic') ?> </span></legend>
-                        <label for="muse">
-                        <input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('muse') ?>
-                        </label>
-                        <label for="crush">
-                        <input class="valinp" type="checkbox" name="romantic" value="crush" id="crush" <?php xfn_check('romantic', 'crush'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('crush') ?>
-                        </label>
-                        <label for="date">
-                        <input class="valinp" type="checkbox" name="romantic" value="date" id="date" <?php xfn_check('romantic', 'date'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('date') ?>
-                        </label>
-                        <label for="romantic">
-                        <input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('sweetheart') ?>
-                        </label>
-                </fieldset></td>
-        </tr>
-</table>
-<p><?php _e('If the link is to a person, you can specify your relationship with them using the above form. If you would like to learn more about the idea check out <a href="http://gmpg.org/xfn/">XFN</a>.'); ?></p>
-<?php
+}
-/**
- * Display advanced link options form fields.
+ *
- * @since 2.6.0
+ *
- * @param object $link
- */
-function link_advanced_meta_box($link) {
-?>
-<table class="links-table" cellpadding="0">
-        <tr>
-                <th scope="row"><label for="link_image"><?php _e('Image Address') ?></label></th>
-                <td><input type="text" name="link_image" class="code" id="link_image" value="<?php echo ( isset( $link->link_image ) ? esc_attr($link->link_image) : ''); ?>" /></td>
-        </tr>
-        <tr>
-                <th scope="row"><label for="rss_uri"><?php _e('RSS Address') ?></label></th>
-                <td><input name="link_rss" class="code" type="text" id="rss_uri" value="<?php echo ( isset( $link->link_rss ) ? esc_attr($link->link_rss) : ''); ?>" /></td>
-        </tr>
-        <tr>
-                <th scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th>
-                <td><textarea name="link_notes" id="link_notes" rows="10"><?php echo ( isset( $link->link_notes ) ? $link->link_notes : ''); // textarea_escaped ?></textarea></td>
-        </tr>
-        <tr>
-                <th scope="row"><label for="link_rating"><?php _e('Rating') ?></label></th>
-                <td><select name="link_rating" id="link_rating" size="1">
-                <?php
-                        for ( $r = 0; $r <= 10; $r++ ) {
-                                echo '<option value="' . $r . '"';
-                                if ( isset($link->link_rating) && $link->link_rating == $r )
-                                        echo ' selected="selected"';
-                                echo('>' . $r . '</option>');
+                        }
-                ?></select>&nbsp;<?php _e('(Leave at 0 for no rating.)') ?>
-                </td>
-        </tr>
-</table>
-<?php
+}
-/**
  * Display post thumbnail meta box.
+ *
  * @since 2.9.0

wp-admin/includes/update-core.php

 // 3.5
 'wp-admin/gears-manifest.php',
 'wp-admin/includes/manifest.php',
+'wp-admin/edit-link-form.php',
+'wp-admin/includes/class-wp-links-list-table.php',
+'wp-admin/link-add.php',
+'wp-admin/link-manager.php',
+'wp-admin/link-parse-opml.php',
+'wp-admin/link.php',
+'wp-includes/bookmark.php',
+'wp-includes/bookmark-template.php',
+'wp-admin/includes/bookmark.php',
 );
 /**

wp-admin/includes/template.php

         return $popular_ids;
+}
-/**
- * {@internal Missing Short Description}}
+ *
- * @since 2.5.1
+ *
- * @param unknown_type $link_id
- */
-function wp_link_category_checklist( $link_id = 0 ) {
-        $default = 1;
-        if ( $link_id ) {
-                $checked_categories = wp_get_link_cats( $link_id );
-                // No selected categories, strange
-                if ( ! count( $checked_categories ) )
-                        $checked_categories[] = $default;
-        } else {
-                $checked_categories[] = $default;
+        }
-        $categories = get_terms( 'link_category', array( 'orderby' => 'name', 'hide_empty' => 0 ) );
-        if ( empty( $categories ) )
-                return;
-        foreach ( $categories as $category ) {
-                $cat_id = $category->term_id;
-                $name = esc_html( apply_filters( 'the_category', $category->name ) );
-                $checked = in_array( $cat_id, $checked_categories ) ? ' checked="checked"' : '';
-                echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', $checked, '/> ', $name, "</label></li>";
+        }
+}
 // adds hidden fields with the data for use in the inline editor for posts and pages
 /**
  * {@internal Missing Short Description}}
 …
                 $screen = convert_to_screen( $screen );
         $page = $screen->id;
         $hidden = get_hidden_meta_boxes( $screen );
         printf('<div id="%s-sortables" class="meta-box-sortables">', htmlspecialchars($context));

wp-admin/includes/user.php

+}
 /**
  * Remove user and optionally reassign posts and links to another user.
+ * Remove user and optionally reassign posts to another user.
+ *
  * If the $reassign parameter is not assigned to an User ID, then all posts will
  * be deleted of that user. The action 'delete_user' that is passed the User ID
 …
  * @since 2.0.0
+ *
  * @param int $id User ID.
  * @param int $reassign Optional. Reassign posts and links to new User ID.
+ * @param int $reassign Optional. Reassign posts to new User ID.
  * @return bool True when finished.
  */
 function wp_delete_user( $id, $reassign = 'novalue' ) {
 …
                         foreach ( $post_ids as $post_id )
                                 wp_delete_post( $post_id );
+                }
-                // Clean links
-                $link_ids = $wpdb->get_col( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id) );
-                if ( $link_ids ) {
-                        foreach ( $link_ids as $link_id )
-                                wp_delete_link($link_id);
+                }
         } else {
                 $reassign = (int) $reassign;
                 $wpdb->update( $wpdb->posts, array('post_author' => $reassign), array('post_author' => $id) );
                 $wpdb->update( $wpdb->links, array('link_owner' => $reassign), array('link_owner' => $id) );
+                do_action( 'reassign_user_data', $id, $reassign );
+        }
         // FINALLY, delete user

wp-admin/includes/ms.php


148	148	wp_delete_post( $post_id );
149	149	}
150	150
151		~~// Clean links~~
152		~~$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );~~
153
154		~~if ( $link_ids ) {~~
155		~~foreach ( $link_ids as $link_id )~~
156		~~wp_delete_link( $link_id );~~
157		}
158
159	151	restore_current_blog();
160	152	}
161	153	}

wp-admin/edit-tags.php

 if ( current_user_can($tax->cap->edit_terms) )
         wp_enqueue_script('inline-edit-tax');
+if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $taxonomy  ) {
+do_action( 'edit_' . $taxonomy . '_help', $taxonomy );
+if ( 'category' == $taxonomy || 'post_tag' == $taxonomy  ) {
         $help ='';
         if ( 'category' == $taxonomy )
                 $help = '<p>' . sprintf(__( 'You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.' ) , 'options-writing.php' ) . '</p>';
-        elseif ( 'link_category' == $taxonomy )
-                $help = '<p>' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '</p>';
         else
                 $help = '<p>' . __( 'You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.' ) . '</p>';
+        if ( 'link_category' == $taxonomy )
+                $help .= '<p>' . __( 'You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '</p>';
+        else
+                $help .='<p>' . __( 'What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '</p>';
+        $help .='<p>' . __( 'What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '</p>';
         get_current_screen()->add_help_tab( array(
                 'id'      => 'overview',
                 'title'   => __('Overview'),
 …
         if ( 'category' == $taxonomy )
                 $help .= '<p>' . __( '<a href="http://codex.wordpress.org/Posts_Categories_Screen" target="_blank">Documentation on Categories</a>' ) . '</p>';
-        elseif ( 'link_category' == $taxonomy )
-                $help .= '<p>' . __( '<a href="http://codex.wordpress.org/Links_Link_Categories_Screen" target="_blank">Documentation on Link Categories</a>' ) . '</p>';
         else
                 $help .= '<p>' . __( '<a href="http://codex.wordpress.org/Posts_Tags_Screen" target="_blank">Documentation on Tags</a>' ) . '</p>';
 …
         // Back compat hooks. Deprecated in preference to {$taxonomy}_pre_add_form
         if ( 'category' == $taxonomy )
                 do_action('add_category_form_pre', (object)array('parent' => 0) );
-        elseif ( 'link_category' == $taxonomy )

Context Navigation

Ticket #21307: link-manager.diff