Changes from trunk/wp-includes/bookmark.php at r17146 to branches/3.1/wp-includes/bookmark.php at r18355

File:

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

branches/3.1/wp-includes/bookmark.php

@@ -214 +214 @@
         $orderby = strtolower($orderby);
         $length = '';
-        switch ($orderby) {
+        switch ( $orderby ) {
                 case 'length':
                         $length = ", CHAR_LENGTH(link_name) AS length";
@@ -221 +221 @@
                         $orderby = 'rand()';
                         break;
+                case 'link_id':
+                        $orderby = "$wpdb->links.link_id";
+                        break;
                 default:
                         $orderparams = array();
-                        foreach ( explode(',', $orderby) as $ordparam )
-                                $orderparams[] = 'link_' . trim($ordparam);
+                        foreach ( explode(',', $orderby) as $ordparam ) {
+                                $ordparam = trim($ordparam);
+                                if ( in_array( $ordparam, array( 'name', 'url', 'visible', 'rating', 'owner', 'updated' ) ) )
+                                        $orderparams[] = 'link_' . $ordparam;
+                        }
                         $orderby = implode(',', $orderparams);
         }
 
-        if ( 'link_id' == $orderby )
-                $orderby = "$wpdb->links.link_id";
+        if ( empty( $orderby ) )
+                $orderby = 'link_name';
+
+        $order = strtoupper( $order );
+        if ( '' !== $order && !in_array( $order, array( 'ASC', 'DESC' ) ) )
+                $order = 'ASC';
 
         $visible = '';