[otrs-cvs] otrs/Kernel/Output/HTML Layout.pm,1.77,1.78

[cvs-log at otrs.org]

Comments:
Update of /home/cvs/otrs/Kernel/Output/HTML
In directory lancelot:/tmp/cvs-serv5534/Kernel/Output/HTML

Modified Files:
	Layout.pm 
Log Message:
Simplify the output function.

Author: tr

Index: Layout.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Output/HTML/Layout.pm,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** Layout.pm	18 Mar 2008 16:19:29 -0000	1.77
--- Layout.pm	2 Apr 2008 04:48:33 -0000	1.78
***************
*** 498,512 ****
  
      # fill init Env
!     if ( !$Self->{EnvRef} ) {
  
!         # build OTRS env
!         %{$Self->{EnvRef}} = %ENV;
  
!         # all $Self->{*}
!         for ( keys %{$Self} ) {
!             if ( defined( $Self->{$_} ) && !ref( $Self->{$_} ) ) {
!                 $Self->{EnvRef}->{$_} = $Self->{$_};
!             }
          }
      }
  
--- 498,516 ----
  
      # fill init Env
!     %{$Self->{EnvRef}} = %ENV;
  
!     # all $Self->{*}
!     for ( keys %{$Self} ) {
!         if ( defined( $Self->{$_} ) && !ref( $Self->{$_} ) ) {
!             $Self->{EnvRef}->{$_} = $Self->{$_};
!         }
!     }
  
!     # add new env
!     if ( $Self->{EnvNewRef} ) {
!         for ( %{ $Self->{EnvNewRef} } ) {
!             $Self->{EnvRef}->{$_} = $Self->{EnvNewRef}->{$_};
          }
+         undef $Self->{EnvNewRef};
      }
  
***************
*** 573,590 ****
      }
  
-     # get %Env from $Self->{EnvRef}
-     my $EnvRef = $Self->{EnvRef};
- 
-     # add new env
-     if ( $Self->{EnvNewRef} ) {
-         for ( %{ $Self->{EnvNewRef} } ) {
-             $EnvRef->{$_} = $Self->{EnvNewRef}->{$_};
-         }
-         undef $Self->{EnvNewRef};
-     }
- 
      # create refs
      my $GlobalRef = {
!         Env    => $EnvRef,
          Data   => $Param{Data},
          Config => $Self->{ConfigObject},
--- 577,583 ----
      }
  
      # create refs
      my $GlobalRef = {
!         Env    => $Self->{EnvRef},
          Data   => $Param{Data},
          Config => $Self->{ConfigObject},
***************
*** 1032,1038 ****
      }
  
-     # save %Env
-     $Self->{EnvRef} = $EnvRef;
- 
      # custom post filters
      if ( $Self->{FilterElementPost} ) {
--- 1025,1028 ----