[otrs-cvs] otrs/Kernel/System/Web UploadCache.pm,1.10,1.11

[CVS commits notifications of OTRS.org]

Comments:
Update of /home/cvs/otrs/Kernel/System/Web
In directory lancelot:/tmp/cvs-serv30580/Web

Modified Files:
	UploadCache.pm 
Log Message:
Replaced OTRS GmbH with OTRS AG. Simplify code for a better readability.

Author: tr

Index: UploadCache.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/System/Web/UploadCache.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** UploadCache.pm	2 Oct 2007 10:35:04 -0000	1.10
--- UploadCache.pm	29 Apr 2008 11:35:29 -0000	1.11
***************
*** 1,5 ****
  # --
  # Kernel/System/Web/UploadCache.pm - a fs upload cache
! # Copyright (C) 2001-2007 OTRS GmbH, http://otrs.org/
  # --
  # $Id$
--- 1,5 ----
  # --
  # Kernel/System/Web/UploadCache.pm - a fs upload cache
! # Copyright (C) 2001-2008 OTRS AG, http://otrs.org/
  # --
  # $Id$
***************
*** 7,11 ****
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl.txt.
  # --
  
--- 7,11 ----
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl-2.0.txt.
  # --
  
***************
*** 48,67 ****
      );
      my $MainObject = Kernel::System::Main->new(
!         LogObject => $LogObject,
          ConfigObject => $ConfigObject,
      );
      my $EncodeObject = Kernel::System::Encode->new(
          ConfigObject => $ConfigObject,
!         LogObject => $LogObject,
      );
      my $DBObject = Kernel::System::DB->new(
          ConfigObject => $ConfigObject,
!         LogObject => $LogObject,
      );
      my $UploadCache= Kernel::System::Web::UploadCache->new(
          ConfigObject => $ConfigObject,
!         LogObject => $LogObject,
!         DBObject => $DBObject,
          EncodeObject => $EncodeObject,
      );
  
--- 48,69 ----
      );
      my $MainObject = Kernel::System::Main->new(
!         LogObject    => $LogObject,
          ConfigObject => $ConfigObject,
      );
      my $EncodeObject = Kernel::System::Encode->new(
          ConfigObject => $ConfigObject,
!         LogObject    => $LogObject,
      );
      my $DBObject = Kernel::System::DB->new(
          ConfigObject => $ConfigObject,
!         LogObject    => $LogObject,
!         MainObject   => $MainObject,
      );
      my $UploadCache= Kernel::System::Web::UploadCache->new(
          ConfigObject => $ConfigObject,
!         LogObject    => $LogObject,
!         DBObject     => $DBObject,
          EncodeObject => $EncodeObject,
+         MainObject   => $MainObject,
      );
  
***************
*** 86,95 ****
      if ( $Self->{MainObject}->Require( $Self->{GenericModule} ) ) {
          $Self->{Backend} = $Self->{GenericModule}->new(%Param);
      }
!     else {
!         return;
!     }
! 
!     return $Self;
  }
  
--- 88,94 ----
      if ( $Self->{MainObject}->Require( $Self->{GenericModule} ) ) {
          $Self->{Backend} = $Self->{GenericModule}->new(%Param);
+         return $Self;
      }
!     return;
  }
  
***************
*** 215,219 ****
  This software comes with ABSOLUTELY NO WARRANTY. For details, see
  the enclosed file COPYING for license information (GPL). If you
! did not receive this file, see http://www.gnu.org/licenses/gpl.txt.
  
  =cut
--- 214,218 ----
  This software comes with ABSOLUTELY NO WARRANTY. For details, see
  the enclosed file COPYING for license information (GPL). If you
! did not receive this file, see http://www.gnu.org/licenses/gpl-2.0.txt.
  
  =cut