From 2b15fa5b187530d55cb2d41e1451664baef4dd99 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Wed, 20 Aug 2008 07:32:21 +0000
Subject: #1485223: http://pear.php.net/bugs/bug.php?id=14529

git-svn-id: https://svn.roundcube.net/trunk@1661 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/lib/Mail/mime.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'roundcubemail/program/lib/Mail')

diff --git a/roundcubemail/program/lib/Mail/mime.php b/roundcubemail/program/lib/Mail/mime.php
index 507cacab2..92c797b28 100644
--- a/roundcubemail/program/lib/Mail/mime.php
+++ b/roundcubemail/program/lib/Mail/mime.php
@@ -350,7 +350,7 @@ class Mail_mime
             $err = PEAR::raiseError($msg);
             return $err;
         }
-        $filename = basename($filename);
+        $filename = substr('s_'.basename($filename), 2);
         if (PEAR::isError($filedata)) {
             return $filedata;
         }
@@ -667,7 +667,7 @@ class Mail_mime
 
                 $this->_htmlbody = preg_replace($regex, $rep, $this->_htmlbody);
                 $this->_html_images[$key]['name'] = 
-                    basename($this->_html_images[$key]['name']);
+                    substr(basename('s_'.$this->_html_images[$key]['name']), 2);
             }
         }
 
-- 
cgit v1.2.3