Merge branch 'master' into stable

1 files changed, 3 insertions, 3 deletions

diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index 5c043fb6b..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'] = 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) {
@@ -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;
         }
 
@@ -2972,7 +2972,7 @@ class JpegMeta {
             elseif ($c == 62)
                 $ascii .= '&gt;';
             elseif ($c == 32)
-                $ascii .= '&nbsp;';
+                $ascii .= '&#160;';
             elseif ($c > 32)
                 $ascii .= chr($c);
             else