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

Timestamp:

11/13/2008 07:17:40 AM (17 years ago)

Author:

markjaquith

Message:

Code cleanup for wp-admin/includes/bookmark.php

File:

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

trunk/wp-admin/includes/bookmark.php

@@ -77 +77 @@
  * @return unknown
  */
-function wp_delete_link($link_id) {
+function wp_delete_link( $link_id ) {
     global $wpdb;
 
-    do_action('delete_link', $link_id);
-
-    wp_delete_object_term_relationships($link_id, 'link_category');
-
-    $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->links WHERE link_id = %d", $link_id) );
-
-    do_action('deleted_link', $link_id);
-
-    clean_bookmark_cache($link_id);
+    do_action( 'delete_link', $link_id );
+
+    wp_delete_object_term_relationships( $link_id, 'link_category' );
+
+    $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->links WHERE link_id = %d", $link_id ) );
+
+    do_action( 'deleted_link', $link_id );
+
+    clean_bookmark_cache( $link_id );
 
     return true;
@@ -101 +101 @@
  * @return unknown
  */
-function wp_get_link_cats($link_id = 0) {
-
-    $cats = wp_get_object_terms($link_id, 'link_category', 'fields=ids');
-
-    return array_unique($cats);
+function wp_get_link_cats( $link_id = 0 ) {
+
+    $cats = wp_get_object_terms( $link_id, 'link_category', 'fields=ids' );
+
+    return array_unique( $cats );
 }
 
@@ -128 +128 @@
  * @return unknown
  */
-function wp_insert_link($linkdata, $wp_error = false) {
+function wp_insert_link( $linkdata, $wp_error = false ) {
     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(stripslashes_deep($linkdata), EXTR_SKIP);
+    $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) )
+    if ( !empty( $link_id ) )
         $update = true;
 
@@ -149 +149 @@
         return 0;
 
-    if ( empty($link_rating) )
+    if ( empty( $link_rating ) )
         $link_rating = 0;
 
-    if ( empty($link_image) )
+    if ( empty( $link_image ) )
         $link_image = '';
 
-    if ( empty($link_target) )
+    if ( empty( $link_target ) )
         $link_target = '';
 
-    if ( empty($link_visible) )
+    if ( empty( $link_visible ) )
         $link_visible = 'Y';
 
-    if ( empty($link_owner) )
+    if ( empty( $link_owner ) )
         $link_owner = $current_user->id;
 
-    if ( empty($link_notes) )
+    if ( empty( $link_notes ) )
         $link_notes = '';
 
-    if ( empty($link_description) )
+    if ( empty( $link_description ) )
         $link_description = '';
 
-    if ( empty($link_rss) )
+    if ( empty( $link_rss ) )
         $link_rss = '';
 
-    if ( empty($link_rel) )
+    if ( empty( $link_rel ) )
         $link_rel = '';
 
     // Make sure we set a valid category
-    if (0 == count($link_category) || !is_array($link_category)) {
-        $link_category = array(get_option('default_link_category'));
+    if ( 0 == count( $link_category ) || !is_array( $link_category ) ) {
+        $link_category = array( get_option( 'default_link_category' ) );
     }
 
     if ( $update ) {
-        if ( false === $wpdb->query( $wpdb->prepare("UPDATE $wpdb->links SET link_url = %s,
+        if ( false === $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->links SET link_url = %s,
             link_name = %s, link_image = %s, link_target = %s,
             link_visible = %s, link_description = %s, link_rating = %s,
             link_rel = %s, link_notes = %s, link_rss = %s
-            WHERE link_id = %s", $link_url, $link_name, $link_image, $link_target, $link_visible, $link_description, $link_rating, $link_rel, $link_notes, $link_rss, $link_id) ) ) {
+            WHERE link_id = %s", $link_url, $link_name, $link_image, $link_target, $link_visible, $link_description, $link_rating, $link_rel, $link_notes, $link_rss, $link_id ) ) ) {
             if ( $wp_error )
-                return new WP_Error('db_update_error', __('Could not update link in the database'), $wpdb->last_error);
+                return new WP_Error( 'db_update_error', __( 'Could not update link in the database' ), $wpdb->last_error );
             else
                 return 0;
         }
     } else {
-        if ( false === $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->links (link_url, link_name, link_image, link_target, link_description, link_visible, link_owner, link_rating, link_rel, link_notes, link_rss) VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)",
-        $link_url,$link_name, $link_image, $link_target, $link_description, $link_visible, $link_owner, $link_rating, $link_rel, $link_notes, $link_rss) ) ) {
+        if ( false === $wpdb->query( $wpdb->prepare( "INSERT INTO $wpdb->links (link_url, link_name, link_image, link_target, link_description, link_visible, link_owner, link_rating, link_rel, link_notes, link_rss) VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)",
+        $link_url,$link_name, $link_image, $link_target, $link_description, $link_visible, $link_owner, $link_rating, $link_rel, $link_notes, $link_rss ) ) ) {
             if ( $wp_error )
-                return new WP_Error('db_insert_error', __('Could not insert link into the database'), $wpdb->last_error);
+                return new WP_Error( 'db_insert_error', __( 'Could not insert link into the database' ), $wpdb->last_error );
             else
                 return 0;
@@ -203 +203 @@
     }
 
-    wp_set_link_cats($link_id, $link_category);
+    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);
+        do_action( 'edit_link', $link_id );
+    else
+        do_action( 'add_link', $link_id );
+
+    clean_bookmark_cache( $link_id );
 
     return $link_id;
@@ -223 +223 @@
  * @param unknown_type $link_categories
  */
-function wp_set_link_cats($link_id = 0, $link_categories = array()) {
+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);
+    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 );
 }   // wp_set_link_cats()
 
@@ -244 +244 @@
  * @return unknown
  */
-function wp_update_link($linkdata) {
+function wp_update_link( $linkdata ) {
     $link_id = (int) $linkdata['link_id'];
 
-    $link = get_link($link_id, ARRAY_A);
+    $link = get_link( $link_id, ARRAY_A );
 
     // Escape data pulled from DB.
-    $link = add_magic_quotes($link);
+    $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']) )
+    if ( isset( $linkdata['link_category'] ) && is_array( $linkdata['link_category'] )
+             && 0 != count( $linkdata['link_category'] ) )
         $link_cats = $linkdata['link_category'];
     else
@@ -260 +260 @@
 
     // Merge old and new fields with new fields overwriting old ones.
-    $linkdata = array_merge($link, $linkdata);
+    $linkdata = array_merge( $link, $linkdata );
     $linkdata['link_category'] = $link_cats;
 
-    return wp_insert_link($linkdata);
+    return wp_insert_link( $linkdata );
 }