Index: class.tx_dam_browse_media.php
===================================================================
--- class.tx_dam_browse_media.php	(Revision 30366)
+++ class.tx_dam_browse_media.php	(Arbeitskopie)
@@ -970,9 +970,18 @@
 			if($this->damSC->selection->res) {
 				while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($this->damSC->selection->res)) {
 
-					$row = $this->enhanceItemArray($row, $mode);
-
-					$filearray[] = $row;
+					# WS-Overlay ???
+					if (isset($GLOBALS['BE_USER']->workspace) && $GLOBALS['BE_USER']->workspace !== 0) {
+						t3lib_befunc::workspaceOL('tx_dam', $row);
+					}
+					
+					if (is_array($row)) {
+						$row = $this->enhanceItemArray($row, $mode);
+						$filearray[] = $row;
+					}
+					
 					if (count($filearray) >= $this->damSC->selection->pointer->itemsPerPage) {
 						break;
 					}