Pass edid to the mediamanager

3 files changed, 5 insertions, 3 deletions

diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php
index 6f2add2be..02fde5a8d 100644
--- a/lib/exe/mediamanager.php
+++ b/lib/exe/mediamanager.php
@@ -91,7 +91,7 @@
             if ($res & DOKU_MEDIA_EMPTY_NS) {
                 // current namespace was removed. redirecting to root ns passing msg along
                 send_redirect(DOKU_URL.'lib/exe/mediamanager.php?msg1='.
-                        rawurlencode($msg));
+                        rawurlencode($msg).'&edid='.$_REQUEST['edid']);
             }
             msg($msg,1);
         } elseif ($res & DOKU_MEDIA_INUSE) {
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index b90f7047b..57f599163 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -536,7 +536,9 @@ var media_manager = {
                 }
             }
         }
-        opener.insertTags('wiki__text','{{'+alignleft+id+opts+alignright+'|','}}','');
+        var edid = String.prototype.match.call(document.location, /&edid=([^&]+)/);
+        edid = edid ? edid[1] : 'wiki__text';
+        opener.insertTags(edid,'{{'+alignleft+id+opts+alignright+'|','}}','');
 
         if(!media_manager.keepopen) window.close();
         opener.focus();
diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js
index 3f967448c..d458960ab 100644
--- a/lib/scripts/toolbar.js
+++ b/lib/scripts/toolbar.js
@@ -153,7 +153,7 @@ function tb_insert(btn, props, edid) {
  */
 function tb_mediapopup(btn, props, edid) {
     window.open(
-        DOKU_BASE+props['url']+encodeURIComponent(NS),
+        DOKU_BASE+props['url']+encodeURIComponent(NS)+'&edid='+encodeURIComponent(edid),
         props['name'],
         props['options']);
     return false;