summaryrefslogtreecommitdiff
path: root/inc/template.php
diff options
context:
space:
mode:
authorAndreas Gohr <gohr@cosmocode.de>2009-09-01 17:17:03 +0200
committerAndreas Gohr <gohr@cosmocode.de>2009-09-01 17:17:03 +0200
commitc9f568299c0bb7d6aa8d9ce127c53db6bb38e8aa (patch)
tree4babeb2af1b9591c16541da535a0a2faff15d252 /inc/template.php
parent3516221c46f9dbe5b082ac745cfb0a06f44c3906 (diff)
downloadrpg-c9f568299c0bb7d6aa8d9ce127c53db6bb38e8aa.tar.gz
rpg-c9f568299c0bb7d6aa8d9ce127c53db6bb38e8aa.tar.bz2
Some changes to the media file search
Ignore-this: 95042b9e60f807e046f93a362444a551 darcs-hash:20090901151703-6e07b-2c2d5a9a381b7ab6a19d1f74ba99aecb1e724181.gz
Diffstat (limited to 'inc/template.php')
-rw-r--r--inc/template.php9
1 files changed, 4 insertions, 5 deletions
diff --git a/inc/template.php b/inc/template.php
index 9564dcef8..afd23bf5f 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1190,11 +1190,8 @@ function tpl_mediaContent($fromajax=false){
global $NS;
global $JUMPTO;
- ptln('<div id="media__content">');
- if($_REQUEST['edit']){
- media_metaform($IMG,$AUTH);
- }elseif(is_array($INUSE)){
- media_filesinuse($INUSE,$IMG);
+ if(is_array($_REQUEST['do'])){
+ $do = array_shift(array_keys($_REQUEST['do']));
}else{
$do = $_REQUEST['do'];
}
@@ -1222,6 +1219,8 @@ function tpl_mediaContent($fromajax=false){
media_filesinuse($INUSE,$IMG);
}elseif($do == 'filelist'){
media_filelist($NS,$AUTH,$JUMPTO);
+ }elseif($do == 'searchlist'){
+ media_searchlist($_REQUEST['q'],$NS,$AUTH);
}else{
msg('Unknown action '.hsc($do),-1);
}