X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fcontrollers%2Fuser.php;fp=application%2Fcontrollers%2Fuser.php;h=8ebfdb3888791f2e6f5451049fec349e95775c03;hb=a69349a99360f6cb64ae3d87f6572f1d8a98400f;hp=43b26a3afe819a8f2c50bbab9bd196bc23d74f4b;hpb=faf92fa039c2be353c94d0d0e8e488e56eaa5058;p=living-lab-site.git diff --git a/application/controllers/user.php b/application/controllers/user.php index 43b26a3..8ebfdb3 100644 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -257,19 +257,14 @@ class User extends CI_Controller { // ** // Logged in user time zone $time_zone = $this->session->userdata('time_zone'); - if (! $time_zone) - $time_zone = 'UTC'; // User data $userdata = $this->users_model->get_userdata($username); $userdata['roles'] = Users_model::roles_to_string($userdata['roles']); $country_list = $this->config->item('country_list'); $userdata['country_name'] = $country_list[ $userdata['country'] ]; - $userdata['last_login'] = date('Y-m-d H:i:s', - gmt_to_local( - strtotime($userdata['last_login']), - $time_zone, - TRUE)) . ($time_zone == 'UTC' ? ' (UTC)' : ''); + $userdata['last_login'] = human_gmt_to_human_local( + $userdata['last_login'], $time_zone); $userdata['time_zone'] = $this->lang->line($userdata['time_zone']); // User's videos