diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2006-05-20 19:21:18 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2006-05-20 19:21:18 +0200 |
| commit | 7b877f510da04125ec5c9c1f8cda3800f4499ee5 (patch) | |
| tree | 5265057a5c9dc06916a15633262c3831d45d8408 | |
| parent | 8073bfb3ed64a1aa1f8477f4351c80ee841679f9 (diff) | |
| download | rpg-7b877f510da04125ec5c9c1f8cda3800f4499ee5.tar.gz rpg-7b877f510da04125ec5c9c1f8cda3800f4499ee5.tar.bz2 | |
minor media manager tweaks
darcs-hash:20060520172118-7ad00-ad605bf51c8774d734012ece0071f70e6624788a.gz
| -rw-r--r-- | inc/template.php | 2 | ||||
| -rw-r--r-- | lib/exe/mediamanager.php | 1 | ||||
| -rw-r--r-- | lib/tpl/default/mediamanager.php | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/inc/template.php b/inc/template.php index e79b312db..aace105d0 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 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() ?> |