CVSROOT: /cvsroot/phpgroupware
Module name: calendar
Changes by: Dave Hall <skwashd> 06/08/31 10:50:45
Modified files:
inc : class.holidaycalc.inc.php
Log message:
fix for http://www.frsirt.com/english/advisories/2006/3414
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.holidaycalc.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
Patches:
Index: class.holidaycalc.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.holidaycalc.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- class.holidaycalc.inc.php 15 May 2005 06:57:37 -0000 1.8
+++ class.holidaycalc.inc.php 31 Aug 2006 10:50:45 -0000 1.9
@@ -11,9 +11,10 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.holidaycalc.inc.php,v 1.8 2005/05/15 06:57:37 skwashd Exp $ */
+ /* $Id: class.holidaycalc.inc.php,v 1.9 2006/08/31 10:50:45 skwashd Exp $ */
- if
(empty($GLOBALS['phpgw_info']['user']['preferences']['common']['country']))
+ if (
!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['country'])
+ ||
strlen($GLOBALS['phpgw_info']['user']['preferences']['common']['country']) <> 2
)
{
$rule = 'US';
}
@@ -25,10 +26,10 @@
$calc_include =
PHPGW_INCLUDE_ROOT.'/calendar/inc/class.holidaycalc_'.$rule.'.inc.php';
if(@file_exists($calc_include))
{
- include($calc_include);
+ include_once($calc_include);
}
else
{
-
include(PHPGW_INCLUDE_ROOT.'/calendar/inc/class.holidaycalc_US.inc.php');
+
include_once(PHPGW_INCLUDE_ROOT.'/calendar/inc/class.holidaycalc_US.inc.php');
}
?>
_______________________________________________
Phpgroupware-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/phpgroupware-cvs
