summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-12-28 02:25:38 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-12-28 02:25:38 +0000
commit936c78c2b8f0e5fdeaea81e9758d277a90ea62ad (patch)
tree84675967e8920e38feed0207c046a88e62cf7133
parent0b4e8ed38c7543f14b703600be165b68f999a4db (diff)
downloadampache-936c78c2b8f0e5fdeaea81e9758d277a90ea62ad.tar.gz
ampache-936c78c2b8f0e5fdeaea81e9758d277a90ea62ad.tar.bz2
ampache-936c78c2b8f0e5fdeaea81e9758d277a90ea62ad.zip
updated disable icon and fixed an issue with mass flagging and selecting multiple albums
-rw-r--r--admin/flag.php16
-rw-r--r--images/icon_disable.pngbin715 -> 587 bytes
2 files changed, 16 insertions, 0 deletions
diff --git a/admin/flag.php b/admin/flag.php
index ac621e65..e6a2d431 100644
--- a/admin/flag.php
+++ b/admin/flag.php
@@ -188,6 +188,22 @@ switch ($action) {
$object = $_REQUEST['update_field'];
$flag = new Flag();
+ /* If this is an album we need to pull the songs */
+ if ($_REQUEST['type'] == 'album') {
+
+ // Define the results array
+ $results = array();
+
+ foreach ($songs as $album_id) {
+ $album = new Album($album_id);
+ $results = array_merge($results,$album->get_song_ids());
+ } // end foreach albums
+
+ // Re-assign the variable... HACK ALERT :(
+ $songs = $results;
+
+ } // is album
+
/* Foreach the songs we need to update */
foreach ($songs as $song_id) {
diff --git a/images/icon_disable.png b/images/icon_disable.png
index 08f24936..c149c2bc 100644
--- a/images/icon_disable.png
+++ b/images/icon_disable.png
Binary files differ