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
Don't fallback from uk to ru
[lhc/web/wiklou.git]
/
includes
/
media
/
XMPValidate.php
diff --git
a/includes/media/XMPValidate.php
b/includes/media/XMPValidate.php
index
519c420
..
fe47f47
100644
(file)
--- a/
includes/media/XMPValidate.php
+++ b/
includes/media/XMPValidate.php
@@
-70,7
+70,7
@@
class XMPValidate implements LoggerAwareInterface {
return;
}
if ( $val !== 'True' && $val !== 'False' ) {
return;
}
if ( $val !== 'True' && $val !== 'False' ) {
- $this->
debug
->info( __METHOD__ . " Expected True or False but got $val" );
+ $this->
logger
->info( __METHOD__ . " Expected True or False but got $val" );
$val = null;
}
}
$val = null;
}
}
@@
-218,8
+218,9
@@
class XMPValidate implements LoggerAwareInterface {
*
* This is just a naive check to make sure it somewhat looks like a lang code.
*
*
* This is just a naive check to make sure it somewhat looks like a lang code.
*
- * @see rfc 3066
- * @see http://www.adobe.com/devnet/xmp/pdfs/XMPSpecificationPart1.pdf page 30 (section 8.2.2.5)
+ * @see BCP 47
+ * @see https://wwwimages2.adobe.com/content/dam/Adobe/en/devnet/xmp/pdfs/
+ * XMP%20SDK%20Release%20cc-2014-12/XMPSpecificationPart1.pdf page 22 (section 8.2.2.4)
*
* @param array $info Information about current property
* @param mixed &$val Current value to validate
*
* @param array $info Information about current property
* @param mixed &$val Current value to validate
@@
-259,7
+260,7
@@
class XMPValidate implements LoggerAwareInterface {
// this only validates standalone properties, not arrays, etc
return;
}
// this only validates standalone properties, not arrays, etc
return;
}
- $res =
array()
;
+ $res =
[]
;
// @codingStandardsIgnoreStart Long line that cannot be broken
if ( !preg_match(
/* ahh! scary regex... */
// @codingStandardsIgnoreStart Long line that cannot be broken
if ( !preg_match(
/* ahh! scary regex... */
@@
-360,7
+361,7
@@
class XMPValidate implements LoggerAwareInterface {
return;
}
return;
}
- $m =
array()
;
+ $m =
[]
;
if ( preg_match(
'/(\d{1,3}),(\d{1,2}),(\d{1,2})([NWSE])/D',
$val, $m )
if ( preg_match(
'/(\d{1,3}),(\d{1,2}),(\d{1,2})([NWSE])/D',
$val, $m )