fazer

--- system/controllers/itiny/frontend.php       2019-02-03 14:41:18.000000000 +0300
+++ system/controllers/itiny/frontend.php       2019-02-06 13:24:28.518335658 +0300
@@ -103,9 +103,10 @@
                     'url' => $this->cms_config->upload_host . '/' . $path
                 );
 
-                if ($preset['is_watermark'] && $preset['wm_image']) {
-                    img_add_watermark($image['path'], $preset['wm_image']['original'], $preset['wm_origin'], $preset['wm_margin'], $preset['quality']);
-                }
+           if ($preset['is_watermark'] && $preset['wm_image']['original']) {
+       $replPath = str_replace('/upload/', '', $image['path']);
+   img_add_watermark($replPath, $preset['wm_image']['original'], $preset['wm_origin'], $preset['wm_margin'], $preset['quality']);
+               }
 
                 files_delete_file($result['path'], 2);

--- wysiwyg/itiny/plugins/itinyspoiler/plugin.js        2019-02-06 13:29:29.735746292 +0300
+++ wysiwyg/itiny/plugins/itinyspoiler/plugin.js        2019-02-06 13:29:29.731746220 +0300
@@ -49,7 +49,7 @@
                     var text = e.data.spoiler_text ? e.data.spoiler_text : spoilerText;
                     var uniq = Math.random().toString(36).substr(2, 9);
 
-                    text = text.replace(/<br>/gi, '\n');
+                    text = text.replace(/\n/gi, "<br>");
 
                     if (!text) {
                         return alert(I18n.translate('Select the text'));