From 7b877f510da04125ec5c9c1f8cda3800f4499ee5 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 20 May 2006 19:21:18 +0200 Subject: minor media manager tweaks darcs-hash:20060520172118-7ad00-ad605bf51c8774d734012ece0071f70e6624788a.gz --- inc/template.php | 2 +- lib/exe/mediamanager.php | 1 + 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('
'); 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 @@
-
+

-- cgit v1.2.3