summaryrefslogtreecommitdiff
path: root/roundcubemail/program/lib/html2text.php
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-08-06 09:25:45 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-08-06 09:25:45 +0000
commit7ad6424fc522074e3028de59b29c465fc03cc1f9 (patch)
tree5ed1ab29b1a9864a572d0c6edd3c92601da6f39e /roundcubemail/program/lib/html2text.php
parentfe116f9ef8536b761a5128223b7889820ca4a142 (diff)
- fread() replaced by file_get_contents(), see comments in #1484880
git-svn-id: https://svn.roundcube.net/trunk@1631 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/lib/html2text.php')
-rw-r--r--roundcubemail/program/lib/html2text.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/roundcubemail/program/lib/html2text.php b/roundcubemail/program/lib/html2text.php
index 7d7d9d1f4..af8e936cc 100644
--- a/roundcubemail/program/lib/html2text.php
+++ b/roundcubemail/program/lib/html2text.php
@@ -274,13 +274,11 @@ class html2text
*/
function set_html( $source, $from_file = false )
{
- $this->html = $source;
-
if ( $from_file && file_exists($source) ) {
- $fp = fopen($source, 'r');
- $this->html = fread($fp, filesize($source));
- fclose($fp);
+ $this->html = file_get_contents($source);
}
+ else
+ $this->html = $source;
$this->_converted = false;
}