diff options
| author | Paul 'flowerysong' Arthur <flowerysong00@yahoo.com> | 2010-06-10 05:33:57 +0000 |
|---|---|---|
| committer | Paul 'flowerysong' Arthur <flowerysong00@yahoo.com> | 2010-06-10 05:33:57 +0000 |
| commit | 7f3669335313adf9108119df4186a51a5f94e292 (patch) | |
| tree | f8b488a09df2198723de5661b050bc31e112b7ab /admin | |
| parent | c1ed41a16dcbf1a632ad2ac99b40174628bf072e (diff) | |
| download | ampache-7f3669335313adf9108119df4186a51a5f94e292.tar.gz ampache-7f3669335313adf9108119df4186a51a5f94e292.tar.bz2 ampache-7f3669335313adf9108119df4186a51a5f94e292.zip | |
Change Browse from static to instantiable. Among other things, fixes FS#13;
probably also breaks things. Most things appear to still work, but I may have
missed some cases.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/flag.php | 20 | ||||
| -rw-r--r-- | admin/index.php | 8 | ||||
| -rw-r--r-- | admin/shout.php | 10 | ||||
| -rw-r--r-- | admin/users.php | 14 |
4 files changed, 32 insertions, 20 deletions
diff --git a/admin/flag.php b/admin/flag.php index 1d419421..8eaf310a 100644 --- a/admin/flag.php +++ b/admin/flag.php @@ -293,19 +293,23 @@ switch ($_REQUEST['action']) { break; case 'show_disabled': $disabled = Flag::get_disabled(); - Browse::set_type('song'); - Browse::set_static_content(1); - Browse::save_objects($disabled); - Browse::show_objects($disabled); + $browse = new Browse(); + $browse->set_type('song'); + $browse->set_static_content(true); + $browse->save_objects($disabled); + $browse->show_objects($disabled); + $browse->store(); break; default: case 'show_flagged': $flagged = Flag::get_all(); Flag::build_cache($flagged); - Browse::set_type('flagged'); - Browse::set_static_content(1); - Browse::save_objects($flagged); - Browse::show_objects($flagged); + $browse = new Browse(); + $browse->set_type('flagged'); + $browse->set_static_content(true); + $browse->save_objects($flagged); + $browse->show_objects($flagged); + $browse->store(); break; } // end switch diff --git a/admin/index.php b/admin/index.php index ccb77661..db0427bc 100644 --- a/admin/index.php +++ b/admin/index.php @@ -33,8 +33,12 @@ switch ($_REQUEST['action']) { default: // Show Catalogs $catalog_ids = Catalog::get_catalogs(); - Browse::set_type('catalog'); - Browse::show_objects($catalog_ids); + $browse = new Browse(); + $browse->set_type('catalog'); + $browse->set_static_content(true); + $browse->save_objects($catalog_ids); + $browse->show_objects($catalog_ids); + $browse->store(); break; } diff --git a/admin/shout.php b/admin/shout.php index b88ab1c1..55c6093f 100644 --- a/admin/shout.php +++ b/admin/shout.php @@ -48,10 +48,12 @@ switch ($_REQUEST['action']) { show_confirmation(_('Shoutbox Post Deleted'),'',Config::get('web_path').'/admin/shout.php'); break; default: - Browse::set_type('shoutbox'); - Browse::set_simple_browse(1); - $shoutbox_ids = Browse::get_objects(); - Browse::show_objects($shoutbox_ids); + $browse = new Browse(); + $browse->set_type('shoutbox'); + $browse->set_simple_browse(true); + $shoutbox_ids = $browse->get_objects(); + $browse->show_objects($shoutbox_ids); + $browse->store(); break; } // end switch on action diff --git a/admin/users.php b/admin/users.php index e9e52564..eb675c5a 100644 --- a/admin/users.php +++ b/admin/users.php @@ -193,12 +193,14 @@ switch ($_REQUEST['action']) { require_once Config::get('prefix') . '/templates/show_user_preferences.inc.php'; break; default: - Browse::reset_filters(); - Browse::set_type('user'); - Browse::set_simple_browse(1); - Browse::set_sort('name','ASC'); - $user_ids = Browse::get_objects(); - Browse::show_objects($user_ids); + $browse = new Browse(); + $browse->reset_filters(); + $browse->set_type('user'); + $browse->set_simple_browse(1); + $browse->set_sort('name','ASC'); + $user_ids = $browse->get_objects(); + $browse->show_objects($user_ids); + $browse->store(); break; } // end switch on action |