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 "Fix Special:Userrights temp groups with no non-temp groups"
[lhc/web/wiklou.git]
/
includes
/
media
/
IPTC.php
diff --git
a/includes/media/IPTC.php
b/includes/media/IPTC.php
index
ef7ed5f
..
441c515
100644
(file)
--- a/
includes/media/IPTC.php
+++ b/
includes/media/IPTC.php
@@
-445,9
+445,9
@@
class IPTC {
*/
private static function convIPTCHelper( $data, $charset ) {
if ( $charset ) {
*/
private static function convIPTCHelper( $data, $charset ) {
if ( $charset ) {
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$data = iconv( $charset, "UTF-8//IGNORE", $data );
$data = iconv( $charset, "UTF-8//IGNORE", $data );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
if ( $data === false ) {
$data = "";
wfDebugLog( 'iptc', __METHOD__ . " Error converting iptc data charset $charset to utf-8" );
if ( $data === false ) {
$data = "";
wfDebugLog( 'iptc', __METHOD__ . " Error converting iptc data charset $charset to utf-8" );