diff --git a/api/js/etemplate/et2_widget_htmlarea.js b/api/js/etemplate/et2_widget_htmlarea.js index ea19cebd9f..be8f957961 100644 --- a/api/js/etemplate/et2_widget_htmlarea.js +++ b/api/js/etemplate/et2_widget_htmlarea.js @@ -49,7 +49,7 @@ var et2_htmlarea = (function(){ "use strict"; return et2_inputWidget.extend([et2 'type':'boolean', 'description': 'Have the toolbar expanded (visible)' }, - 'base_href': { + 'base_href': { // seems not to be used anymore 'name': 'Image base path', 'default': et2_no_init, 'type': 'string', @@ -71,7 +71,7 @@ var et2_htmlarea = (function(){ "use strict"; return et2_inputWidget.extend([et2 }, imageUpload: { name: "imageUpload", - description: "Url to upload images dragged in or id of link_to widget to it's vfs upload", + description: "Url to upload images dragged in or id of link_to widget to it's vfs upload. Can also be just a name for which content array contains a path to upload the picture.", type: "string", default: null } diff --git a/api/src/Etemplate/Widget/Vfs.php b/api/src/Etemplate/Widget/Vfs.php index 10f46a64c7..f471dd4950 100644 --- a/api/src/Etemplate/Widget/Vfs.php +++ b/api/src/Etemplate/Widget/Vfs.php @@ -143,7 +143,8 @@ class Vfs extends File else { $data = self::$request->content[$widget_id]; - $path = self::store_file($path = self::get_vfs_path($data['to_app'].':'.$data['to_id']).'/', $_FILES['upload']); + $path = self::store_file($path = (!is_array($data) && $data[0] == '/' ? $data : + self::get_vfs_path($data['to_app'].':'.$data['to_id'])).'/', $_FILES['upload']); // store temp. vfs-path like links to be able to move it to correct location after entry is stored if (!$data['to_id'] || is_array($data['to_id']))