浏览代码

552342: Timezone option has no effect when running in safemode.

Pontus Ullgren 23 年之前
父节点
当前提交
b9cbbb8a8e
共有 1 个文件被更改,包括 22 次插入20 次删除
  1. 22 20
      src/options_personal.php

+ 22 - 20
src/options_personal.php

@@ -116,29 +116,31 @@ function load_optpage_data_personal() {
             'comment' =>  $identities_link_value
         );
     }
-
-    $TZ_ARRAY[SMPREF_NONE] = _("Same as server");
-    $fd = fopen('../locale/timezones.cfg','r');
-    while (!feof ($fd)) {
-        $zone = fgets($fd, 1024);
-        if( $zone ) {
-            $zone = trim($zone);
-            $TZ_ARRAY["$zone"] = "$zone";
+    
+    if (  !ini_get("safe_mode") ) {
+        $TZ_ARRAY[SMPREF_NONE] = _("Same as server");
+        $fd = fopen('../locale/timezones.cfg','r');
+        while (!feof ($fd)) {
+            $zone = fgets($fd, 1024);
+            if( $zone ) {
+                $zone = trim($zone);
+                $TZ_ARRAY["$zone"] = "$zone";
+            }
         }
-    }
-    fclose ($fd);
+        fclose ($fd);
 
-    $optgrps[SMOPT_GRP_TZ] = _("Timezone Options");
-    $optvals[SMOPT_GRP_TZ] = array();
-
-    $optvals[SMOPT_GRP_TZ][] = array(
-        'name'    => 'timezone',
-        'caption' => _("Your current timezone"),
-        'type'    => SMOPT_TYPE_STRLIST,
-        'refresh' => SMOPT_REFRESH_NONE,
-        'posvals' => $TZ_ARRAY
-    );
+        $optgrps[SMOPT_GRP_TZ] = _("Timezone Options");
+        $optvals[SMOPT_GRP_TZ] = array();
 
+        $optvals[SMOPT_GRP_TZ][] = array(
+            'name'    => 'timezone',
+            'caption' => _("Your current timezone"),
+            'type'    => SMOPT_TYPE_STRLIST,
+            'refresh' => SMOPT_REFRESH_NONE,
+            'posvals' => $TZ_ARRAY
+        );
+    }
+    
     /*** Load the Reply Citation Options into the array ***/
     $optgrps[SMOPT_GRP_REPLY] = _("Reply Citation Options");
     $optvals[SMOPT_GRP_REPLY] = array();