diff --git a/inc/template.php b/inc/template.php
index e79b312dbf8585a168315c323636f2649770bf1f..aace105d041f3bd876080cf82e1abd9fc2c7bb33 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -863,7 +863,7 @@ function tpl_mediaContent(){
ptln('<div id="media__content">');
if($_REQUEST['edit']){
media_metaform($IMG,$AUTH);
- }elseif($INUSE){
+ }elseif(is_array($INUSE)){
media_filesinuse($INUSE,$IMG);
}else{
media_filelist($NS,$AUTH,$JUMPTO);
diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php
index 8b645e43484befa0cd589ba818e3672a83fe0ff2..23140ee3cc2bcc487261ff813f4d951e3b13e7d3 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 10b31ba63f7d21020dc00ccb2039f12b93e356f5..0ae4f7c66b751cec07f41b9e4979f1f16dcb8ff8 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() ?>