dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add Vary: X-Forwarded-Proto for https redirects"
[lhc/web/wiklou.git]
/
includes
/
media
/
XMPValidate.php
diff --git
a/includes/media/XMPValidate.php
b/includes/media/XMPValidate.php
index
f727400
..
87f8abf
100644
(file)
--- a/
includes/media/XMPValidate.php
+++ b/
includes/media/XMPValidate.php
@@
-101,7
+101,7
@@
class XMPValidate {
$val = null;
return;
} else {
$val = null;
return;
} else {
- $nVal = (float)
$val;
+ $nVal = (float)$val;
if ( $nVal < 0 ) {
// We do < 0 here instead of < -1 here, since
// the values between 0 and -1 are also illegal
if ( $nVal < 0 ) {
// We do < 0 here instead of < -1 here, since
// the values between 0 and -1 are also illegal
@@
-346,8
+346,8
@@
class XMPValidate {
$val, $m )
) {
$coord = intval( $m[1] );
$val, $m )
) {
$coord = intval( $m[1] );
- $coord += intval( $m[2] ) * (
1/60
);
- $coord += intval( $m[3] ) * (
1/3600
);
+ $coord += intval( $m[2] ) * (
1 / 60
);
+ $coord += intval( $m[3] ) * (
1 / 3600
);
if ( $m[4] === 'S' || $m[4] === 'W' ) {
$coord = -$coord;
}
if ( $m[4] === 'S' || $m[4] === 'W' ) {
$coord = -$coord;
}
@@
-358,7
+358,7
@@
class XMPValidate {
$val, $m )
) {
$coord = intval( $m[1] );
$val, $m )
) {
$coord = intval( $m[1] );
- $coord += floatval( $m[2] ) * (
1/60
);
+ $coord += floatval( $m[2] ) * (
1 / 60
);
if ( $m[3] === 'S' || $m[3] === 'W' ) {
$coord = -$coord;
}
if ( $m[3] === 'S' || $m[3] === 'W' ) {
$coord = -$coord;
}