Merge branch 'master' into jquery-ui

blueimp · blueimp · commit 3e40b69d2dbd · 2012-11-17T21:01:35.000+01:00
diff --git a/server/php/upload.class.php b/server/php/upload.class.php
@@ -635,7 +635,7 @@ public function head() {
         // Prevent Internet Explorer from MIME-sniffing the content-type:
         header('X-Content-Type-Options: nosniff');
         if ($this->options['access_control_allow_origin']) {
-           $this->send_access_control_headers();
+            $this->send_access_control_headers();
         }
         $this->send_content_type_header();
     }

Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,7 @@ public function head() {`
`635`	`635`	`// Prevent Internet Explorer from MIME-sniffing the content-type:`
`636`	`636`	`header('X-Content-Type-Options: nosniff');`
`637`	`637`	`if ($this->options['access_control_allow_origin']) {`
`638`		`- $this->send_access_control_headers();`
	`638`	`+ $this->send_access_control_headers();`
`639`	`639`	`}`
`640`	`640`	`$this->send_content_type_header();`
`641`	`641`	`}`