Index: taxonomy.php
===================================================================
--- taxonomy.php	(revision 36613)
+++ taxonomy.php	(working copy)
@@ -175,16 +175,24 @@
  */
 function get_object_taxonomies( $object, $output = 'names' ) {
 	global $wp_taxonomies;
-
+	$taxonomies = array();
+	
 	if ( is_object($object) ) {
-		if ( $object->post_type == 'attachment' )
-			return get_attachment_taxonomies($object);
+		if ( $object->post_type == 'attachment' ){
+			$attachment_taxonomies = get_attachment_taxonomies($object);
+			foreach ( $attachment_taxonomies as $attachment_tax ) {					
+				if ( 'names' == $output )
+					$taxonomies[] = $attachment_tax;
+				else
+					$taxonomies[ $attachment_tax ] = $wp_taxonomies[$attachment_tax];
+			}
+			return $taxonomies;
+		}
 		$object = $object->post_type;
 	}
 
 	$object = (array) $object;
 
-	$taxonomies = array();
 	foreach ( (array) $wp_taxonomies as $tax_name => $tax_obj ) {
 		if ( array_intersect($object, (array) $tax_obj->object_type) ) {
 			if ( 'names' == $output )