From 881ed532241f0350e0a377067333a4fb4ef749b0 Mon Sep 17 00:00:00 2001
From: Chad Little <clittle@users.sourceforge.net>
Date: Thu, 27 Oct 2005 17:41:24 +0000
Subject: Took acc out of list

---
 functions/calendar_functions.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'functions/calendar_functions.php')

diff --git a/functions/calendar_functions.php b/functions/calendar_functions.php
index ebe1634..7a5d88e 100644
--- a/functions/calendar_functions.php
+++ b/functions/calendar_functions.php
@@ -193,23 +193,23 @@ function display_ical_list($cals, $pick=FALSE) {
 			} else {
 					$return .= "<option value=\"$cal_encoded_tmp\">$cal_displayname_tmp</option>\n";	
 			}
-		}
-		else {
+		} else {
 		$cal_httpPrefix_tmp = str_replace('webcal://', 'http://', $cal_tmp);
 		if ($cal_httpPrefix_tmp == urldecode($cal)) {
 			$return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&amp;getdate=$getdate\" selected=\"selected\">$cal_displayname_tmp</option>";
 		} else {
 			$return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&amp;getdate=$getdate\">$cal_displayname_tmp</option>";	
 		}
-	}			
+	 }			
 	}			
 
 	// option to open all (non-web) calenders together
-	if ($cal == $ALL_CALENDARS_COMBINED) {
-		$return .=  "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&amp;getdate=$getdate\" selected=\"selected\">$all_cal_comb_lang</option>";
-	} else {
-		$return .=  "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&amp;getdate=$getdate\">$all_cal_comb_lang</option>";
+	if (!$pick) {
+		if ($cal == $ALL_CALENDARS_COMBINED) {
+			$return .=  "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&amp;getdate=$getdate\" selected=\"selected\">$all_cal_comb_lang</option>";
+		} else {
+			$return .=  "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&amp;getdate=$getdate\">$all_cal_comb_lang</option>";
+		}
 	}
-	
 	return $return;
 }
\ No newline at end of file
-- 
cgit v1.2.3