summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2009-04-15 20:54:49 +0200
committerAndreas Gohr <andi@splitbrain.org>2009-04-15 20:54:49 +0200
commitde4e429de2d06b43b680a6271f2771b36ae26813 (patch)
treed921f2386739741e72500152ccfcdf1f9f03206b
parent26afa8741483efa55615f7d142d93d8c6222c018 (diff)
downloadrpg-de4e429de2d06b43b680a6271f2771b36ae26813.tar.gz
rpg-de4e429de2d06b43b680a6271f2771b36ae26813.tar.bz2
late add DOKU_BASE for media popup
Ignore-this: 172ae2884fca0ee74d3b9c88c829dabe darcs-hash:20090415185449-7ad00-f9689ddbb2cc4a77aeb7a0cde338ca107187c0d5.gz
-rw-r--r--inc/toolbar.php2
-rw-r--r--lib/scripts/edit.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/inc/toolbar.php b/inc/toolbar.php
index 2e4586630..af1dc8d05 100644
--- a/inc/toolbar.php
+++ b/inc/toolbar.php
@@ -149,7 +149,7 @@ function toolbar_JSdefines($varname){
'type' => 'mediapopup',
'title' => $lang['qb_media'],
'icon' => 'image.png',
- 'url' => DOKU_BASE.'lib/exe/mediamanager.php?ns=',
+ 'url' => 'lib/exe/mediamanager.php?ns=',
'name' => 'mediaselect',
'options'=> 'width=750,height=500,left=20,top=20,scrollbars=yes,resizable=yes',
),
diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index c61c7f7a2..c3265c477 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -250,7 +250,7 @@ function addBtnActionPicker(btn, props, edid, id)
*/
function addBtnActionMediapopup(btn, props)
{
- eval("btn.onclick = function(){window.open('"+
+ eval("btn.onclick = function(){window.open('"+DOKU_BASE+
jsEscape(props['url']+encodeURIComponent(NS))+"','"+
jsEscape(props['name'])+"','"+
jsEscape(props['options'])+