holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed timezone alias update always reports one timezone update, event if it updated nothing

Browse Source
This commit is contained in:
Ralf Becker 2011-10-11 13:09:51 +00:00
parent 84c4174a3a
commit 897bef41f6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.calendar_timezones.inc.php
View File

@ -284,7 +284,7 @@ class calendar_timezones
}
include($path); // sets $tz_aliases
$updated = 0;
$updates = 0;
foreach($tz_aliases as $alias => $tzid)
{
if ((!($alias_id=self::tz2id($alias, 'alias')) || self::id2tz($alias_id, 'tzid') !== $tzid) && // not in DB or different
@ -295,7 +295,7 @@ class calendar_timezones
),array(
'tz_tzid' => $alias,
),__LINE__,__FILE__,'calendar');
++$updated;
++$updates;
}
//error_log(__METHOD__."() alias=$alias, tzid=$tzid --> self::tz2id('$alias', 'alias') = ".array2string($alias_id).", self::tz2id('$tzid')=".array2string($tz_id));
}
@ -303,7 +303,7 @@ class calendar_timezones
//_debug_array($tz2id);
$updated = true;
return lang('Timezones aliases updated to version %1 (%2 records updated).', $tz_aliases_mtime, $updated);
return lang('Timezones aliases updated to version %1 (%2 records updated).', $tz_aliases_mtime, $updates);
}
/**