Fix bug where assets_path wasn't added to some watermark frames

roundcube · Oct 4, 2017 · 22b30de · 22b30de
1 parent 5d3add7
commit 22b30de
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -54,6 +54,7 @@ CHANGELOG Roundcube Webmail
 - Fix missing cursor in HTML editor on mail reply (#5969)
 - Fix (again) bug where image data URIs in css style were treated as evil/remote in mail preview (#5580)
 - Fix bug where mail search could return empty result on servers without SORT capability (#5973)
+- Fix bug where assets_path wasn't added to some watermark frames
 
 RELEASE 1.3.1
 -------------

diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
@@ -1156,10 +1156,13 @@ protected function xml_command($matches)
 
                 // we are calling a class/method
                 if (($handler = $this->object_handlers[$object]) && is_array($handler)) {
-                    if ((is_object($handler[0]) && method_exists($handler[0], $handler[1])) ||
-                    (is_string($handler[0]) && class_exists($handler[0])))
-                    $content  = call_user_func($handler, $attrib);
-                    $external = true;
+                    if (is_callable($handler)) {
+                        // We assume that objects with src attribute are internal (in most
+                        // cases this is a watermark frame). We need this to make sure assets_path
+                        // is added to the internal assets paths
+                        $external = empty($attrib['src']);
+                        $content  = call_user_func($handler, $attrib);
+                    }
                 }
                 // execute object handler function
                 else if (function_exists($handler)) {