From 61a718cb2f7939b18c0b8f7387636f2b9d6f724a Mon Sep 17 00:00:00 2001 From: Alex Tselegidis Date: Thu, 28 Oct 2021 14:00:48 +0200 Subject: [PATCH] Updated the Timezones.php library to work with the updated code. --- application/libraries/Timezones.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/application/libraries/Timezones.php b/application/libraries/Timezones.php index 9df4a4c9..d1a16fbd 100644 --- a/application/libraries/Timezones.php +++ b/application/libraries/Timezones.php @@ -12,7 +12,11 @@ * ---------------------------------------------------------------------------- */ /** - * Timezones + * Timezones library + * + * Handles timezone related functionality. + * + * @package Libraries */ class Timezones { /** @@ -503,9 +507,9 @@ class Timezones { */ public function __construct() { - $this->CI = & get_instance(); + $this->CI = &get_instance(); - $this->CI->load->model('user_model'); + $this->CI->load->model('users_model'); } /** @@ -523,13 +527,13 @@ class Timezones { * * @return string */ - public function get_session_timezone() + public function get_session_timezone(): string { $default_timezone = $this->get_default_timezone(); - return $this->CI->session->has_userdata('timezone') - ? $this->CI->session->userdata('timezone') - : $default_timezone; + $timezone = session('timezone'); + + return $timezone ?? $default_timezone; } /**