summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/exe/mediamanager.php1
-rw-r--r--lib/tpl/default/mediamanager.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php
index 8b645e434..23140ee3c 100644
--- a/lib/exe/mediamanager.php
+++ b/lib/exe/mediamanager.php
@@ -36,6 +36,7 @@
// handle upload
if($_FILES['upload']['tmp_name']){
$JUMPTO = media_upload($NS,$AUTH);
+ if($JUMPTO) $NS = getNS($JUMPTO);
}
// handle meta saving
diff --git a/lib/tpl/default/mediamanager.php b/lib/tpl/default/mediamanager.php
index 10b31ba63..0ae4f7c66 100644
--- a/lib/tpl/default/mediamanager.php
+++ b/lib/tpl/default/mediamanager.php
@@ -23,8 +23,8 @@
<body>
<div id="media__manager" class="dokuwiki">
- <?html_msgarea()?>
<div id="media__left">
+ <?html_msgarea()?>
<h1><?php echo hsc($lang['mediaselect'])?></h1>
<?php tpl_mediaTree() ?>