Merge pull request #170 from AntoineLemarchand/form_rework

fix(dbmysql.class.php): try catch in getTimezone
itsmng · Jan 16, 2024 · 440456d · 440456d
2 parents 7b91bc8 + 8ac61ab
commit 440456d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/inc/dbmysql.class.php b/inc/dbmysql.class.php
@@ -1670,17 +1670,21 @@ public function getTimezones() {
       $from_php = \DateTimeZone::listIdentifiers();
       $now = new \DateTime();
 
-      $iterator = $this->request([
-         'SELECT' => 'Name',
-         'FROM'   => 'mysql.time_zone_name',
-         'WHERE'  => ['Name' => $from_php]
-      ]);
-
-      while ($from_mysql = $iterator->next()) {
-         $now->setTimezone(new \DateTimeZone($from_mysql['Name']));
-         $list[$from_mysql['Name']] = $from_mysql['Name'] . $now->format(" (T P)");
+      try {
+         $iterator = $this->request([
+            'SELECT' => 'Name',
+            'FROM'   => 'mysql.time_zone_name',
+            'WHERE'  => ['Name' => $from_php]
+         ]);
+         while ($from_mysql = $iterator->next()) {
+            $now->setTimezone(new \DateTimeZone($from_mysql['Name']));
+            $list[$from_mysql['Name']] = $from_mysql['Name'] . $now->format(" (T P)");
+         }
+      } catch (\Exception $e) {
+         //do nothing
       }
 
+
       return $list;
    }
 

diff --git a/inc/user.class.php b/inc/user.class.php
@@ -2642,7 +2642,7 @@ function showMyForm($target, $ID) {
                         'name' => 'language',
                         'type' => 'select',
                         'values' => Language::getLanguages(),
-                        'value' => $this->fields['language'] ?? '',
+                        'value' => $this->fields['language'] ?? Session::getPreferredLanguage(),
                      ],
                      __('Password') => (!$extauth && Session::haveRight("password_update", "1")) ? [
                         'name' => 'password',