Changes from trunk/wp-includes/bookmark-template.php at r5153 to branches/2.2/wp-includes/bookmark-template.php at r5714

File:

• branches/2.2/wp-includes/bookmark-template.php (modified) (2 diffs)

branches/2.2/wp-includes/bookmark-template.php

@@ -254 +254 @@
         'after' => '</li>', 'between' => "\n");
     $r = array_merge($defaults, $r);
-    extract($r);
+    extract($r, EXTR_SKIP);
 
     foreach ( (array) $bookmarks as $bookmark ) {
@@ -332 +332 @@
         'category_before' => '<li id="%id" class="%class">', 'category_after' => '</li>');
     $r = array_merge($defaults, $r);
-    extract($r);
+    extract($r, EXTR_SKIP);
 
     $output = '';