Merge branch 'master' into newui

1 files changed, 0 insertions, 31 deletions

diff --git a/addon/js_upload/file-uploader/tests/action-handler-test.php b/addon/js_upload/file-uploader/tests/action-handler-test.php
deleted file mode 100644
index 24466b122..000000000
--- a/addon/js_upload/file-uploader/tests/action-handler-test.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-usleep(300);
-
-$fileName;
-
-if (isset($_GET['qqfile'])){
-    $fileName = $_GET['qqfile'];
-    
-	// xhr request
-	$headers = apache_request_headers();
-	if ((int)$headers['Content-Length'] == 0){
-		die ('{error: "content length is zero"}');
-	}
-} elseif (isset($_FILES['qqfile'])){
-    $fileName = basename($_FILES['qqfile']['name']);
-    
-	// form request
-	if ($_FILES['qqfile']['size'] == 0){
-		die ('{error: "file size is zero"}');
-	}
-} else {
-	die ('{error: "file not passed"}');
-}
-
-if (count($_GET)){
-	//return query params
-	echo json_encode(array_merge($_GET, array('fileName'=>$fileName)));	
-} else {
-	die ('{error: "query params not passed"}');
-}