mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Correct handling of integer keys in the presets array.

Browse Source 
Tthey cannot be treated as strings unless they 're formatted as floats first.
A fine way to waste half an hour.
This commit is contained in:
defacer 2005-04-08 20:26:36 +00:00
parent b529815b9c
commit 256ab4c54a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
admin/calendar.php
View File

@ -87,12 +87,12 @@
require_once('../calendar/lib.php');
// Populate some variables we 're going to need in calendar.html
$presets = get_records_sql('SELECT id, name FROM '.$CFG->prefix.'timezone GROUP BY name');
$records = get_records_sql('SELECT id, name FROM '.$CFG->prefix.'timezone GROUP BY name');
$presets = array();
if(!empty($presets)) {
foreach($presets as $id => $preset) {
if(!empty($records)) {
foreach($records as $preset) {
$presets[$preset->name] = get_string($preset->name, 'timezones');
unset($presets[$id]);
}
}
@ -101,13 +101,13 @@
for($i = -13; $i <= 13; $i += .5) {
$tzstring = get_string('unspecifiedlocation', 'timezones').' / GMT';
if($i < 0) {
$presets["$i"] = $tzstring . $i;
$presets[sprintf("%.1f", $i)] = $tzstring . $i;
}
else if($i > 0) {
$presets["$i"] = $tzstring . '+' . $i;
$presets[sprintf("%.1f", $i)] = $tzstring . '+' . $i;
}
else {
$presets["$i"] = $tzstring;
$presets[sprintf("%.1f", $i)] = $tzstring;
}
}