From e260f93b6cea05bc39bbd77b9db5bdc0c2c424bf Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 5 Jul 2012 22:58:24 +0100 Subject: xml compatibility fixes (mainly entities to unicode conversions) --- inc/JpegMeta.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/JpegMeta.php') diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index 5c043fb6b..ac29bca66 100644 --- a/inc/JpegMeta.php +++ b/inc/JpegMeta.php @@ -2972,7 +2972,7 @@ class JpegMeta { elseif ($c == 62) $ascii .= '>'; elseif ($c == 32) - $ascii .= ' '; + $ascii .= ' '; elseif ($c > 32) $ascii .= chr($c); else -- cgit v1.2.3 From 3009a773c06e6e5d731c42b12ad82272f9706f03 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 28 Jul 2012 10:40:48 +0200 Subject: replaced use of basename() with utf8_basename() FS#2015 --- inc/JpegMeta.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc/JpegMeta.php') diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index ac29bca66..ce643a7e6 100644 --- a/inc/JpegMeta.php +++ b/inc/JpegMeta.php @@ -1209,7 +1209,7 @@ class JpegMeta { function _parseFileInfo() { if (file_exists($this->_fileName) && is_file($this->_fileName)) { $this->_info['file'] = array(); - $this->_info['file']['Name'] = basename($this->_fileName); + $this->_info['file']['Name'] = utf8_basename($this->_fileName); $this->_info['file']['Path'] = fullpath($this->_fileName); $this->_info['file']['Size'] = filesize($this->_fileName); if ($this->_info['file']['Size'] < 1024) { @@ -1300,7 +1300,7 @@ class JpegMeta { } } else { $this->_info['file'] = array(); - $this->_info['file']['Name'] = basename($this->_fileName); + $this->_info['file']['Name'] = utf8_basename($this->_fileName); $this->_info['file']['Url'] = $this->_fileName; } -- cgit v1.2.3 From 17dcc4abef4e2415a31bf7072744bdec1f862cd7 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 28 Jul 2012 17:49:47 +0200 Subject: decode utf8 filenames in JpegMeta FS#2553 --- inc/JpegMeta.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/JpegMeta.php') diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index ce643a7e6..ba6a2b5bb 100644 --- a/inc/JpegMeta.php +++ b/inc/JpegMeta.php @@ -1209,7 +1209,7 @@ class JpegMeta { function _parseFileInfo() { if (file_exists($this->_fileName) && is_file($this->_fileName)) { $this->_info['file'] = array(); - $this->_info['file']['Name'] = utf8_basename($this->_fileName); + $this->_info['file']['Name'] = utf8_decodeFN(utf8_basename($this->_fileName)); $this->_info['file']['Path'] = fullpath($this->_fileName); $this->_info['file']['Size'] = filesize($this->_fileName); if ($this->_info['file']['Size'] < 1024) { -- cgit v1.2.3