#1485227: fixed image list in image popup

git-svn-id: https://svn.roundcube.net/trunk@1609 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 3 insertions, 2 deletions

diff --git a/roundcubemail/program/js/editor.js b/roundcubemail/program/js/editor.js
index 7b22c9e8e..6fdbadccd 100644
--- a/roundcubemail/program/js/editor.js
+++ b/roundcubemail/program/js/editor.js
@@ -31,7 +31,8 @@ function rcmail_editor_init(skin_path, editor_lang)
                  theme_advanced_toolbar_align : "left",
                  extended_valid_elements : "font[face|size|color|style],span[id|class|align|style]",
                  content_css : skin_path + "/editor_content.css",
-                 external_image_list_url : "editor_images.js"
+                 external_image_list_url : "program/js/editor_images.js",
+		 rc_client: rcube_webmail_client
                });
   }
 
diff --git a/roundcubemail/program/js/editor_images.js b/roundcubemail/program/js/editor_images.js
index ddac044cc..373b44e3d 100644
--- a/roundcubemail/program/js/editor_images.js
+++ b/roundcubemail/program/js/editor_images.js
@@ -1,5 +1,5 @@
 
-var rc_client = tinyMCEPopup.windowOpener.rcube_webmail_client;
+var rc_client = tinyMCEPopup.getParam("rc_client");
 if (rc_client.gui_objects.attachmentlist)
 {
    var tinyMCEImageList = new Array();