Fix some JS warnings if there are no DST presets, and correct behavior

when deleting a preset forced for every user.
This commit is contained in:
defacer
2005-02-18 03:33:01 +00:00
parent 876714665d
commit 62576f3c64
2 changed files with 9 additions and 3 deletions
+4 -2
View File
@@ -42,8 +42,10 @@
<!--
var DSTPresetInfo = new Array();
<?php
foreach($presetdescriptions as $id => $desc) {
echo 'DSTPresetInfo['.$id.'] = "'.$desc.'";';
if(!empty($presetdescriptions)) {
foreach($presetdescriptions as $id => $desc) {
echo 'DSTPresetInfo['.$id.'] = "'.$desc.'";';
}
}
?>
+5 -1
View File
@@ -43,7 +43,11 @@
// First delete the preset
delete_records('dst_preset', 'id', $presetid);
// And then disable DST for all users who had selected that preset
execute_sql('UPDATE '.$CFG->prefix.'user_preferences SET value = 0 WHERE name = \'calendar_dstpreset\' AND value = '.$presetid, false);
execute_sql('UPDATE '.$CFG->prefix.'user SET dstpreset = 0 WHERE dstpreset = '.$presetid, false);
// If it's forced for everyone, release them...
if($CFG->calendar_dstforusers == $presetid) {
set_config('calendar_dstforusers', 0);
}
}
break;
}