From: Nik Okuntseff Date: Sun, 11 Mar 2018 23:25:59 +0000 (+0000) Subject: Rollback of role upgrade as something apparently not working. X-Git-Tag: timetracker_1.19-1~1057 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=585e3677a73f80cadd664572e3863fc38e4d8633;p=timetracker.git Rollback of role upgrade as something apparently not working. --- diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 84441b48..d04ee534 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.17.37.4054 | Copyright © Anuko | +  Anuko Time Tracker 1.17.38.4055 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/initialize.php b/initialize.php index 63ed88d5..53342b68 100644 --- a/initialize.php +++ b/initialize.php @@ -170,11 +170,12 @@ $msg = new ActionErrors(); // Notification messages (not errrors) for user. import('ttUser'); $user = new ttUser(null, $auth->getUserId()); // Temporary code to assign role_id to users who don't yet have it. +/* if ($user->login && !$user->role_id) { $user->migrateLegacyRole(); // Recycle User object, now with proper role_id. $user = new ttUser(null, $auth->getUserId()); -} +}*/ if ($user->custom_logo) { $smarty->assign('custom_logo', 'images/'.$user->team_id.'.png'); $smarty->assign('mobile_custom_logo', '../images/'.$user->team_id.'.png');