Changeset 5906 for trunk/wp-admin/includes/bookmark.php

Timestamp:

08/20/2007 10:50:04 PM (17 years ago)

Author:

ryan

Message:

bookmark sanitizer funcs and default filter cleanup. see #4546

File:

• trunk/wp-admin/includes/bookmark.php (modified) (2 diffs)

trunk/wp-admin/includes/bookmark.php

@@ -61 +61 @@
 
 function get_link_to_edit( $link_id ) {
-    $link = get_link( $link_id );
-
-    $link->link_url         = clean_url($link->link_url);
-    $link->link_name        = attribute_escape($link->link_name);
-    $link->link_image       = attribute_escape($link->link_image);
-    $link->link_description = attribute_escape($link->link_description);
-    $link->link_rss         = clean_url($link->link_rss);
-    $link->link_rel         = attribute_escape($link->link_rel);
-    $link->link_notes       =  wp_specialchars($link->link_notes);
-    $link->post_category    = $link->link_category;
-
-    return $link;
+    return get_link( $link_id, OBJECT, 'edit' );
 }
 
 function wp_insert_link($linkdata) {
     global $wpdb, $current_user;
+
+    $defaults = array('link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0 );
+
+    $linkdata = wp_parse_args($linkdata, $defaults);
+    $linkdata = sanitize_bookmark($linkdata, 'db');
 
     extract($linkdata, EXTR_SKIP);
@@ -85 +79 @@
         $update = true;
 
-    $link_id = (int) $link_id;
+    if ( trim( $link_name ) == '' )
+        return 0;
 
-    if( trim( $link_name ) == '' )
+    if ( trim( $link_url ) == '' )
         return 0;
-    $link_name = apply_filters('pre_link_name', $link_name);
-
-    if( trim( $link_url ) == '' )
-        return 0;
-    $link_url = apply_filters('pre_link_url', $link_url);
 
     if ( empty($link_rating) )
         $link_rating = 0;
-    else
-        $link_rating = (int) $link_rating;
 
     if ( empty($link_image) )
         $link_image = '';
-    $link_image = apply_filters('pre_link_image', $link_image);
 
     if ( empty($link_target) )
         $link_target = '';
-    $link_target = apply_filters('pre_link_target', $link_target);
 
     if ( empty($link_visible) )
         $link_visible = 'Y';
-    $link_visibile = preg_replace('/[^YNyn]/', '', $link_visible);
 
     if ( empty($link_owner) )
         $link_owner = $current_user->id;
-    else
-        $link_owner = (int) $link_owner;
 
     if ( empty($link_notes) )
         $link_notes = '';
-    $link_notes = apply_filters('pre_link_notes', $link_notes);
 
     if ( empty($link_description) )
         $link_description = '';
-    $link_description = apply_filters('pre_link_description', $link_description);
 
     if ( empty($link_rss) )
         $link_rss = '';
-    $link_rss = apply_filters('pre_link_rss', $link_rss);
 
     if ( empty($link_rel) )
         $link_rel = '';
-    $link_rel = apply_filters('pre_link_rel', $link_rel);
 
     // Make sure we set a valid category