diff --git a/wp-includes/bookmark.php b/wp-includes/bookmark.php
index 5e1af5915..7cd014ce7 100644
--- a/wp-includes/bookmark.php
+++ b/wp-includes/bookmark.php
@@ -221,7 +221,10 @@ function get_bookmarks($args = '') {
 			$orderby = 'rand()';
 			break;
 		default:
-			$orderby = "link_" . $orderby;
+			$orderparams = array();
+			foreach ( explode(',', $orderby) as $ordparam )
+				$orderparams[] = 'link_' . trim($ordparam);
+			$orderby = implode(',', $orderparams);
 	}
 
 	if ( 'link_id' == $orderby )