summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-10-16 09:34:22 +0200
committerAleksander Machniak <alec@alec.pl>2013-10-16 09:35:36 +0200
commite2f90dbd4e25c9c95764c30126ad7d2a1ec213c0 (patch)
tree041888a589e22dcda77feaa59cdc93cfff27c0f9 /program
parentff993eb483ef6cf28ed7c2face235c53e00bbd71 (diff)
Do not add css files to the page when body is empty, e.g. upload iframes
Diffstat (limited to 'program')
-rw-r--r--program/include/rcmail_output_html.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index 7cab3725e..6651a9461 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -1280,7 +1280,12 @@ class rcmail_output_html extends rcmail_output
*/
public function _write($templ = '', $base_path = '')
{
- $output = empty($templ) ? $this->default_template : trim($templ);
+ $output = trim($templ);
+
+ if (empty($output)) {
+ $output = $this->default_template;
+ $is_empty = true;
+ }
// set default page title
if (empty($this->pagetitle)) {
@@ -1371,8 +1376,8 @@ class rcmail_output_html extends rcmail_output
}
// add css files in head, before scripts, for speed up with parallel downloads
- if (!empty($this->css_files) &&
- (($pos = stripos($output, '<script ')) || ($pos = stripos($output, '</head>')))
+ if (!empty($this->css_files) && !$is_empty
+ && (($pos = stripos($output, '<script ')) || ($pos = stripos($output, '</head>')))
) {
$css = '';
foreach ($this->css_files as $file) {