summaryrefslogtreecommitdiffstats
path: root/server/browse.ajax.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-12-24 00:57:36 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-12-24 00:57:36 +0000
commit3d8ff28ac56f30075bd9c485e2ee94f486717e6f (patch)
tree46413c2ccfc5d7f99a26ecb3fe6f23ac0a9278cd /server/browse.ajax.php
parentee64379cf4c093d589502e72036759e66671cac7 (diff)
downloadampache-3d8ff28ac56f30075bd9c485e2ee94f486717e6f.tar.gz
ampache-3d8ff28ac56f30075bd9c485e2ee94f486717e6f.tar.bz2
ampache-3d8ff28ac56f30075bd9c485e2ee94f486717e6f.zip
fixed filters being applied incorrectly, and removed un-needed query on show album
Diffstat (limited to 'server/browse.ajax.php')
-rw-r--r--server/browse.ajax.php13
1 files changed, 9 insertions, 4 deletions
diff --git a/server/browse.ajax.php b/server/browse.ajax.php
index f8d67480..ef176d88 100644
--- a/server/browse.ajax.php
+++ b/server/browse.ajax.php
@@ -26,19 +26,24 @@ if (AJAX_INCLUDE != '1') { exit; }
switch ($_REQUEST['action']) {
case 'browse':
+
+ $object_ids = array();
+
if ($_REQUEST['key'] && $_REQUEST['value']) {
// Set any new filters we've just added
- Browse::set_filter($_REQUEST['key'],$_REQUEST['value']);
+ Browse::set_filter($_REQUEST['key'],$_REQUEST['value']);
}
if ($_REQUEST['sort']) {
// Set the new sort value
Browse::set_sort($_REQUEST['sort']);
}
- // Refresh the browse div with our new filter options
- $object_ids = Browse::get_objects();
+ // Refresh the browse div with our new filter options if we're not static
+ if (!Browse::$static_content) {
+ $object_ids = Browse::get_objects();
+ }
- ob_start();
+ ob_start();
Browse::show_objects($object_ids);
$results['browse_content'] = ob_get_contents();
ob_end_clean();