Changeset 9699 for trunk/wp-includes/bookmark.php

Timestamp:

11/14/2008 11:01:16 PM (17 years ago)

Author:

ryan

Message:

Notice fixes from DD32. see #7509

File:

• trunk/wp-includes/bookmark.php (modified) (1 diff)

trunk/wp-includes/bookmark.php

@@ -266 +266 @@
         'link_rel', 'link_notes', 'link_rss', );
 
-    $do_object = false;
-    if ( is_object($bookmark) )
+    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 )
-            $bookmark->$field = sanitize_bookmark_field($field, $bookmark->$field, $bookmark->link_id, $context);
-        else
-            $bookmark[$field] = sanitize_bookmark_field($field, $bookmark[$field], $bookmark['link_id'], $context);
+        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);
+        }
     }