Index: t3lib/class.t3lib_tceforms.php
===================================================================
--- t3lib/class.t3lib_tceforms.php	(revision 3305)
+++ t3lib/class.t3lib_tceforms.php	(working copy)
@@ -2032,7 +2032,7 @@
 
 				if(!$disabled && !(isset($config['disable_controls']) && t3lib_div::inList($config['disable_controls'], 'upload'))) {
 						// Adding the upload field:
-					if ($this->edit_docModuleUpload)	$item.='<input type="file" name="'.$PA['itemFormElName_file'].'"'.$this->formWidth().' size="60" />';
+					if ($this->edit_docModuleUpload && $config['uploadfolder']!="")	$item.='<input type="file" name="'.$PA['itemFormElName_file'].'"'.$this->formWidth().' size="60" />';
 				}
 			break;
 			case 'db':	// If the element is of the internal type "db":
@@ -3310,7 +3310,7 @@
 					while(list(,$pp)=each($itemArray))	{
 						$pParts = explode('|',$pp);
 						$uidList[]=$pUid=$pTitle = $pParts[0];
-						$opt[]='<option value="'.htmlspecialchars(rawurldecode($pParts[0])).'">'.htmlspecialchars(rawurldecode($pParts[0])).'</option>';
+						$opt[]='<option value="'.htmlspecialchars(rawurldecode($pParts[0])).'">'.htmlspecialchars(basename(rawurldecode($pParts[0]))).'</option>';
 					}
 				break;
 				default:
Index: t3lib/class.t3lib_tcemain.php
===================================================================
--- t3lib/class.t3lib_tcemain.php	(revision 3305)
+++ t3lib/class.t3lib_tcemain.php	(working copy)
@@ -1696,6 +1696,13 @@
 				}
 				$valueArray = $dbAnalysis->countItems();
 			}
+		//return path relative to fileadmin Folder (if uploadfolder is not set)
+		} else {
+			if (count($valueArray)){
+				foreach($valueArray as $key => $theFile){
+					$valueArray[$key] = substr($theFile, strpos($theFile, "fileadmin/"));
+				}
+			}
 		}
 
 		return $valueArray;