From 9f708fcbfb9c13d3a07462650bfec3d213cc8a32 Mon Sep 17 00:00:00 2001
From: Git <git@what.cd>
Date: Tue, 6 Dec 2011 08:00:14 +0000
Subject: [PATCH] Empty commit

---
 classes/script_start.php      | 7 +++++--
 sections/staffpm/viewconv.php | 7 +++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/classes/script_start.php b/classes/script_start.php
index dc7db4a9..242ee830 100644
--- a/classes/script_start.php
+++ b/classes/script_start.php
@@ -1575,7 +1575,7 @@ function get_artists($GroupIDs, $Escape = array()) {
 		if(!is_number($GroupID)) {
 			continue;
 		}
-		$Artists = $Cache->get_value('groups_artists_'.$GroupID, true);
+		$Artists = $Cache->get_value('groups_artists_'.$GroupID);
 		if(is_array($Artists)) {
 			$Results[$GroupID] = $Artists;
 		} else {
@@ -1610,6 +1610,10 @@ function get_artists($GroupIDs, $Escape = array()) {
 				$Cache->cache_value('groups_artists_'.$GroupID, array());
 			}
 		}
+		$Missing = array_diff($GroupIDs, array_keys($Results));
+		if(!empty($Missing)) {
+			$Results += array_fill_keys($Missing, array());
+		}
 	}
 	return $Results;
 }
@@ -1777,7 +1781,6 @@ function get_groups($GroupIDs, $Return = true, $GetArtists = true) {
 			$Cache->cache_value('torrent_group_'.$Torrent['GroupID'], array('ver'=>4, 'd'=>$Found[$Torrent['GroupID']]), 0);
 		}
 	}
-
 	if($GetArtists) {
 		$Artists = get_artists($GroupIDs);
 	} else {
diff --git a/sections/staffpm/viewconv.php b/sections/staffpm/viewconv.php
index 2c1d5029..e2aec5ef 100644
--- a/sections/staffpm/viewconv.php
+++ b/sections/staffpm/viewconv.php
@@ -197,13 +197,12 @@
 					<input type="button" value="Assign to forum staff" onClick="location.href='staffpm.php?action=assign&to=forum&convid=<?=$ConvID?>';" />
 <?	}
 
-	if ($Status != 'Resolved') {
-
-			if ($IsFLS) { ?>
+	if ($Status != 'Resolved') { ?>
+					<input type="button" value="Resolve" onClick="location.href='staffpm.php?action=resolve&id=<?=$ConvID?>';" />
+<?			if ($IsFLS) {  //Moved by request ?>
 					<input type="button" value="Common answers" onClick="$('#common_answers').toggle();" />
 					<input type="button" value="Preview" onclick="PreviewMessage();" />
 <?			} ?>
-					<input type="button" value="Resolve" onClick="location.href='staffpm.php?action=resolve&id=<?=$ConvID?>';" />
 					<input type="submit" value="Send message" />
 <?	} else { ?>
 					<input type="button" value="Unresolve" onClick="location.href='staffpm.php?action=unresolve&id=<?=$ConvID?>';" />