summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inc/media.php2
-rw-r--r--lib/scripts/media.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/inc/media.php b/inc/media.php
index 508869b3b..29c3d0153 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -759,7 +759,7 @@ function media_tab_search($ns,$auth=null) {
echo '<div class="search">'.NL;
media_searchform($ns, $query, true);
- if ($do == 'searchlist') {
+ if ($do == 'searchlist' || $query) {
media_searchlist($query,$ns,$auth,true,_media_get_sort_type());
}
echo '</div>'.NL;
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index c74633523..841baa93f 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -135,7 +135,7 @@ var dw_mediamanager = {
});
$sortBy.children('input').change(function (event) {
dw_mediamanager.set_fileview_sort();
- dw_mediamanager.list.call(this, event);
+ dw_mediamanager.list.call(jQuery('#dw__mediasearch')[0] || this, event);
});
},