diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-17 09:15:42 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-17 09:44:51 +0100 |
| commit | a1789ddde42033f1b05cc4929491214ee6e79383 (patch) | |
| tree | 63615735c4ddffaaabf2428946bb26f90899f7bf /includes/media/IPTC.php | |
| parent | 9e06a62f265e3a2aaabecc598d4bc617e06fa32d (diff) | |
Update to MediaWiki 1.26.0
Diffstat (limited to 'includes/media/IPTC.php')
| -rw-r--r-- | includes/media/IPTC.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/media/IPTC.php b/includes/media/IPTC.php index 0eb27cc8..c3d58b8b 100644 --- a/includes/media/IPTC.php +++ b/includes/media/IPTC.php @@ -445,9 +445,9 @@ class IPTC { */ private static function convIPTCHelper( $data, $charset ) { if ( $charset ) { - wfSuppressWarnings(); + MediaWiki\suppressWarnings(); $data = iconv( $charset, "UTF-8//IGNORE", $data ); - wfRestoreWarnings(); + MediaWiki\restoreWarnings(); if ( $data === false ) { $data = ""; wfDebugLog( 'iptc', __METHOD__ . " Error converting iptc data charset $charset to utf-8" ); |