summaryrefslogtreecommitdiff
path: root/modules/system/system.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/system/system.module')
-rw-r--r--modules/system/system.module10
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/system/system.module b/modules/system/system.module
index ea5e703b8..cf1d72d5c 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -76,9 +76,9 @@ function system_link($type) {
}
}
-function system_user($type, &$edit, $user) {
+function system_user($type, $edit, &$user) {
if ($type == "edit_form") {
- $options = "<option value=\"\"". (("" == $key) ? " selected=\"selected\"" : "") .">". t("Default theme") ."</option>\n";
+ $options = "<option value=\"\">". t("Default theme") ."</option>\n";
if (count($themes = list_themes()) > 1) {
foreach ($themes as $key => $value) {
$options .= "<option value=\"$key\"". (($edit["theme"] == $key) ? " selected=\"selected\"" : "") .">$key - $value->description</option>\n";
@@ -92,9 +92,11 @@ function system_user($type, &$edit, $user) {
$zones["$zone"] = date(variable_get("date_format_long", "l, F dS, Y - g:ia"), time() - date("Z") + $zone) . sprintf(" (GMT %s%02d:%02d)\n", ($offset >= 0) ? "+" : "-", floor(abs($offset)), (abs($offset) * 60) % 60);
}
$data[t('Locale settings')] = form_select(t("Time zone"), "timezone", $edit["timezone"], $zones, t("Select what time you currently have and your time zone settings will be set appropriate."));
+ return $data;
+ }
+ else {
+ return $edit;
}
-
- return $data;
}
function system_view_general() {