diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-08-10 16:48:28 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-08-10 16:48:28 +0000 |
| commit | d2131a9fafcfe5a3ec36792616d1896fb94a9ca9 (patch) | |
| tree | 2a7af953b49dd0ff11da0fd50da9503ad7fd2bf5 | |
| parent | aa44ecd66edf1d2655b833161fd42f1e01c110d4 (diff) | |
Check filesize of template includes (#1484409)
git-svn-id: https://svn.roundcube.net/trunk@674 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcmail_template.inc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 6dfbff4e8..75466dd81 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -12,6 +12,7 @@ CHANGELOG RoundCube Webmail - Added //IGNORE to iconv call (patch #1484420, closes #1484023) - Check if mbstring supports charset (#1484290 and #1484292) - Prefer iconv over mbstring (as suggested in #1484292) +- Check filesize of template includes (#1484409) - Updated Simplified Chinese localization - Added Ukrainian translation diff --git a/roundcubemail/program/include/rcmail_template.inc b/roundcubemail/program/include/rcmail_template.inc index 6057f2af3..1c40c0e96 100644 --- a/roundcubemail/program/include/rcmail_template.inc +++ b/roundcubemail/program/include/rcmail_template.inc @@ -453,7 +453,7 @@ class rcmail_template extends rcube_html_page // include a file case 'include': $path = realpath($this->config['skin_path'].$attrib['file']); - if ($fp = @fopen($path, 'r')) + if (filesize($path) && ($fp = @fopen($path, 'r'))) { $incl = fread($fp, filesize($path)); fclose($fp); |