From 917ea58a8c8191494ce0bd9fe15a547523c6fc37 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Thu, 22 Sep 2011 23:24:24 +0200
Subject: [PATCH] fix file uploads for IE

---
 apps/media/js/loader.js |  2 +-
 files/js/files.js       | 25 +++++++++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js
index ef8647eeca5..c6c834d3a31 100644
--- a/apps/media/js/loader.js
+++ b/apps/media/js/loader.js
@@ -52,7 +52,7 @@ $(document).ready(function() {
 	var oc_current_user=OC.currentUser;
 	if(typeof PlayList==='undefined'){
 		if(typeof localStorage !== 'undefined' && localStorage){
-			if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_items') && localStorage.getItem(oc_current_user+'oc_playlist_items')!='[]' && localStorage.getItem(oc_current_user+'oc_playlist_active')!='true'){
+			if(localStorage.getItem(oc_current_user+'oc_playlist_items') && localStorage.getItem(oc_current_user+'oc_playlist_items')!='[]' && localStorage.getItem(oc_current_user+'oc_playlist_active')!='true'){
 				loadPlayer();
 			}
 		}
diff --git a/files/js/files.js b/files/js/files.js
index 7b37837d9cc..8289d418e69 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -163,8 +163,10 @@ $(document).ready(function() {
 		var files=this.files;
 		var target=form.children('iframe');
 		var totalSize=0;
-		for(var i=0;i<files.length;i++){
-			totalSize+=files[i].size;
+		if(files){
+			for(var i=0;i<files.length;i++){
+				totalSize+=files[i].size;
+			}
 		}
 		if(totalSize>$('#max_upload').val()){
 			$( "#uploadsize-message" ).dialog({
@@ -192,13 +194,20 @@ $(document).ready(function() {
 			});
 			form.submit();
 			var date=new Date();
-			for(var i=0;i<files.length;i++){
-				if(files[i].size>0){
-					var size=files[i].size;
-				}else{
-					var size=t('files','Pending');
+			if(files){
+				for(var i=0;i<files.length;i++){
+					if(files[i].size>0){
+						var size=files[i].size;
+					}else{
+						var size=t('files','Pending');
+					}
+					if(files){
+						FileList.addFile(files[i].name,size,date,true);
+					}
 				}
-				FileList.addFile(files[i].name,size,date,true);
+			}else{
+				var filename=this.value.split('\\').pop(); //ie prepends C:\fakepath\ in front of the filename
+				FileList.addFile(filename,'Pending',date,true);
 			}
 
 			//clone the upload form and hide the new one to allow users to start a new upload while the old one is still uploading