Merge branch 'master' of gitlab.coadcorp.com:drupal/booking

booking.studygroups.inc

@@ -560,6 +560,7 @@ function booking_studygroups_edit_form_submit($form, &$form_state) {
 				foreach ($reading_groups as $group) {
 					if ($group->sid == $key) {
 						booking_studygroups_process_colours();
+						break;
 					}
 				}
 			}
@@ -585,6 +586,7 @@ function booking_studygroups_edit_form_submit($form, &$form_state) {
 				foreach ($reading_groups as $group) {
 					if ($group->sid == $key) {
 						booking_studygroups_process_colours();
+						break;
 					}
 				}
 			}	//end new value check
@@ -1545,7 +1547,7 @@ function booking_studygroups_printview_form($node, &$form_state, $group_id) {
  */
 function booking_studygroups_view_form($node, &$form_state, $group_id) {
 	global $event;
-	$is_reading_group = FALSE;
+	//$is_reading_group = FALSE;
 	$form = array();	
 	$options = array();
 	$rows = array();
@@ -1575,18 +1577,12 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
 						array(':eid' => $event->eid, ':sid' => $group_id))
 			->fetchObject();	
 			
-	if (! $group)
-	{
+	if (! $group) {
 		drupal_set_message("Error: Could not find matching study group ID. Unable to view group membership.", 'error', FALSE);
 		drupal_goto('admin/config/booking');
 		return "";			
 	}
-	/*
-	if ($group_id == variable_get('booking_readinggroup_id','7'))
-	{
-		$is_reading_group = TRUE;
-	}
-	*/
+
 	$header = array(
 		'booking_session_id' => array('data' => t('Study Group Session'), 'field' => 'm.booking_session_id', 'sort' => 'asc'),		
 		'booking_name' => array('data' => t('Name'), 'field' => 'p.booking_lastname'),