X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=initialize.php;h=261ec7479dfd06d42689edbaae2a4bd9b0da33c0;hb=995feb6c9e97991e5b9d9803fbc3c8a41ac48922;hp=5dcd6fffde274cb27359f164c10df1a6055a9c11;hpb=5268895d4d0effb998af8e86cf79f8a2d7d53272;p=timetracker.git

diff --git a/initialize.php b/initialize.php
index 5dcd6fff..261ec747 100644
--- a/initialize.php
+++ b/initialize.php
@@ -170,8 +170,8 @@ $msg = new ActionErrors(); // Notification messages (not errrors) for user.
 import('ttUser');
 $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');
+  $smarty->assign('custom_logo', 'images/'.$user->group_id.'.png');
+  $smarty->assign('mobile_custom_logo', '../images/'.$user->group_id.'.png');
 }
 $smarty->assign('user', $user);
 
@@ -199,13 +199,6 @@ if (!$lang) {
 // Load i18n file.
 $i18n->load($lang);
 
-// Temporary code to assign role_id to users who don't yet have it.
-if ($user->login && !$user->role_id) {
-  $user->migrateLegacyRole(); // Note: this requires initialized $i18n.
-  // Recycle User object, now with proper role_id.
-  $user = new ttUser(null, $auth->getUserId());
-}
-
 // Assign things for smarty to use in template files.
 $smarty->assign('i18n', $i18n->keys);
 $smarty->assign('err', $err);