X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FSystem%2FBase.php;h=aeb5411a44dd63105815c910433d066b9936b201;hb=f4aaa82a04876fea07ca47f9498e4caaddf2810b;hp=9cccc92be52e857d68ff9c5ad83b124c2585be74;hpb=00ca8648aca9637f2678082ce09f98772533a8cc;p=civicrm-core.git

diff --git a/CRM/Utils/System/Base.php b/CRM/Utils/System/Base.php
index 9cccc92be5..aeb5411a44 100644
--- a/CRM/Utils/System/Base.php
+++ b/CRM/Utils/System/Base.php
@@ -116,6 +116,8 @@ abstract class CRM_Utils_System_Base {
    * Determine the native ID of the CMS user
    *
    * @param $username
+   *
+   * @throws CRM_Core_Exception
    * @return int|NULL
    */
   function getUfId($username) {
@@ -147,6 +149,9 @@ abstract class CRM_Utils_System_Base {
 
   /**
    * Return default Site Settings
+   *
+   * @param $dir
+   *
    * @return array array
    * - $url, (Joomla - non admin url)
    * - $siteName,
@@ -215,7 +220,7 @@ abstract class CRM_Utils_System_Base {
    * @return string Timezone e.g. 'America/Los_Angeles'
    */
   function getTimeZoneString() {
-    return NULL;
+    return date_default_timezone_get();
   }
 
   /**