From 81605b793e3ec04e325f1869d69d7e0fe8fe66e5 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 3 May 2007 14:05:39 +0000
Subject: [PATCH] "patch #594: country select combo not initialized in
 calendar.uiholiday.edit_holiday"

---
 calendar/inc/class.uiholiday.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/calendar/inc/class.uiholiday.inc.php b/calendar/inc/class.uiholiday.inc.php
index dd25f05f62..29c72841d6 100755
--- a/calendar/inc/class.uiholiday.inc.php
+++ b/calendar/inc/class.uiholiday.inc.php
@@ -267,9 +267,9 @@
 			{
 				$holiday = $this->bo->read_entry($this->bo->id);
 			}
-			if ($this->locale)
+			if ($this->bo->locale)
 			{
-				$holiday['locale'] = $this->locale;
+				$holiday['locale'] = $this->bo->locale;
 			}
 			unset($GLOBALS['egw_info']['flags']['noheader']);
 			unset($GLOBALS['egw_info']['flags']['nonavbar']);