From 9e129c93d74874da721c86e3e96216a319eb09c0 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 23 May 2018 16:07:25 +0000 Subject: [PATCH] Fix blankpage compat. with assets_path setting --- program/include/rcmail_output_html.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index 8c7097012..e3bd1c215 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -146,7 +146,6 @@ EOF; // set blankpage (watermark) url $blankpage = $this->config->get('blankpage_url', '/watermark.html'); - $blankpage = $this->abs_url($blankpage); $this->set_env('blankpage', $blankpage); } @@ -555,6 +554,11 @@ EOF; $this->set_env('request_token', $this->app->get_request_token()); } + // Fix assets path on blankpage + if ($this->js_env['blankpage']) { + $this->js_env['blankpage'] = $this->asset_url($this->abs_url($this->js_env['blankpage'], true)); + } + $commands = $this->get_js_commands($framed); // if all js commands go to parent window we can ignore all