Merge branch 'master' into jquery-ui

blueimp · blueimp · commit 10b79da4dddd · 2012-10-23T15:00:26.000+09:00
diff --git a/server/php/upload.class.php b/server/php/upload.class.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * jQuery File Upload Plugin PHP Class 5.17.1
+ * jQuery File Upload Plugin PHP Class 5.17.2
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -670,7 +670,7 @@ public function delete($print_response = true) {
                 }
             }
         }
-        return $this->generate_response($info, $print_response);
+        return $this->generate_response($success, $print_response);
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`/*`
`3`		`- * jQuery File Upload Plugin PHP Class 5.17.1`
	`3`	`+ * jQuery File Upload Plugin PHP Class 5.17.2`
`4`	`4`	`* https://github.com/blueimp/jQuery-File-Upload`
`5`	`5`	`*`
`6`	`6`	`* Copyright 2010, Sebastian Tschan`
`@@ -670,7 +670,7 @@ public function delete($print_response = true) {`
`670`	`670`	`}`
`671`	`671`	`}`
`672`	`672`	`}`
`673`		`- return $this->generate_response($info, $print_response);`
	`673`	`+ return $this->generate_response($success, $print_response);`
`674`	`674`	`}`
`675`	`675`
`676`	`676`	`}`