[Rt-commit] r7797 - rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT

[clkao at bestpractical.com]

Author: clkao
Date: Wed May  9 11:36:21 2007
New Revision: 7797

Modified:
   rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/CurrentUser.pm

Log:
In _BootstrapCreate, there's still no $RT::System initialised.
Remove a warning by checking $RT::System->id.


Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/CurrentUser.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/CurrentUser.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/CurrentUser.pm	Wed May  9 11:36:21 2007
@@ -203,13 +203,15 @@
         || !UNIVERSAL::can( $self->{'LangHandle'}, 'maketext' )
         || @_ )
     {
-        if ( !$RT::SystemUser or ($self->id || 0) == $RT::SystemUser->id ) {
+        if (   !$RT::SystemUser
+            || !$RT::SystemUser->id
+            || ( $self->id || 0 ) == $RT::SystemUser->id ) {
             @_ = qw(en-US);
         }
-
         elsif ( my $lang = $self->Lang ) {
             push @_, $lang;
         }
+
         $self->{'LangHandle'} = RT::I18N->get_handle(@_);
     }