Merge branch 'master' into jquery-ui

blueimp · blueimp · commit e9b1eaec16a0 · 2012-11-17T20:49:59.000+01: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.18.6
+ * jQuery File Upload Plugin PHP Class 5.18.7
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -53,6 +53,7 @@ function __construct($options = null, $initialize = true) {
                 'GET',
                 'POST',
                 'PUT',
+				'PATCH',
                 'DELETE'
             ),
             'access_control_allow_headers' => array(
@@ -123,6 +124,8 @@ protected function initialize() {
             case 'GET':
                 $this->get();
                 break;
+			case 'PATCH':
+			case 'PUT':
             case 'POST':
                 $this->post();
                 break;
@@ -458,16 +461,16 @@ protected function orient_image($file_path) {
         $image = @imagecreatefromjpeg($file_path);
         switch ($orientation) {
             case 3:
-            $image = @imagerotate($image, 180, 0);
-            break;
+            	$image = @imagerotate($image, 180, 0);
+            	break;
             case 6:
-            $image = @imagerotate($image, 270, 0);
-            break;
+            	$image = @imagerotate($image, 270, 0);
+            	break;
             case 8:
-            $image = @imagerotate($image, 90, 0);
-            break;
+            	$image = @imagerotate($image, 90, 0);
+            	break;
             default:
-            return false;
+            	return false;
         }
         $success = imagejpeg($image, $file_path);
         // Free up memory (imagedestroy does not delete files):
