Skip to content

Commit 2f7800d

Browse files
committed
Updated jQuery to version 1.7.2.
Merge pull request blueimp#1152 from naxhh/master
2 parents 30cacfa + 0681c84 commit 2f7800d

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

cors/postmessage.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<!--
33
/*
4-
* jQuery File Upload Plugin postMessage API 1.1
4+
* jQuery File Upload Plugin postMessage API 1.1.1
55
* https://github.com/blueimp/jQuery-File-Upload
66
*
77
* Copyright 2011, Sebastian Tschan
@@ -15,7 +15,7 @@
1515
<head>
1616
<meta charset="utf-8">
1717
<title>jQuery File Upload Plugin postMessage API</title>
18-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
18+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
1919
</head>
2020
<body>
2121
<script>

index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<!--
33
/*
4-
* jQuery File Upload Plugin Demo 6.5.1
4+
* jQuery File Upload Plugin Demo 6.5.2
55
* https://github.com/blueimp/jQuery-File-Upload
66
*
77
* Copyright 2010, Sebastian Tschan
@@ -199,7 +199,7 @@ <h3>Demo Notes</h3>
199199
</tr>
200200
{% } %}
201201
</script>
202-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
202+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
203203
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js"></script>
204204
<!-- The Templates plugin is included to render the upload/download listings -->
205205
<script src="http://blueimp.github.com/JavaScript-Templates/tmpl.min.js"></script>

server/php/upload.class.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* jQuery File Upload Plugin PHP Class 5.9.1
3+
* jQuery File Upload Plugin PHP Class 5.9.2
44
* https://github.com/blueimp/jQuery-File-Upload
55
*
66
* Copyright 2010, Sebastian Tschan
@@ -229,7 +229,10 @@ protected function trim_file_name($name, $type) {
229229
}
230230

231231
protected function orient_image($file_path) {
232-
$exif = exif_read_data($file_path);
232+
$exif = @exif_read_data($file_path);
233+
if ($exif === false) {
234+
return false;
235+
}
233236
$orientation = intval(@$exif['Orientation']);
234237
if (!in_array($orientation, array(3, 6, 8))) {
235238
return false;

test/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<!--
33
/*
4-
* jQuery File Upload Plugin Test 6.5
4+
* jQuery File Upload Plugin Test 6.5.1
55
* https://github.com/blueimp/jQuery-File-Upload
66
*
77
* Copyright 2010, Sebastian Tschan
@@ -124,7 +124,7 @@ <h2 id="qunit-userAgent"></h2>
124124
</tr>
125125
{% } %}
126126
</script>
127-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
127+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
128128
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js"></script>
129129
<script src="http://blueimp.github.com/JavaScript-Templates/tmpl.min.js"></script>
130130
<script src="http://blueimp.github.com/JavaScript-Load-Image/load-image.min.js"></script>

0 commit comments

Comments
 (0)