From: Sven Schöling <s.schoeling@linet-services.de>
Date: Fri, 1 Feb 2013 13:25:53 +0000 (+0100)
Subject: warnings
X-Git-Tag: release-3.1.0beta1~646^2~3
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;ds=sidebyside;h=1d1cd1ddc70d0b900e8278ff2cac77c1d9bf4a92;p=kivitendo-erp.git

warnings
---

diff --git a/SL/Form.pm b/SL/Form.pm
index c6fd5744a..94d3c566a 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -380,9 +380,10 @@ sub _get_request_uri {
   my $self = shift;
 
   return URI->new($ENV{HTTP_REFERER})->canonical() if $ENV{HTTP_X_FORWARDED_FOR};
+  return URI->new                                  if !$ENV{REQUEST_URI}; # for testing
 
   my $scheme =  $ENV{HTTPS} && (lc $ENV{HTTPS} eq 'on') ? 'https' : 'http';
-  my $port   =  $ENV{SERVER_PORT} || '';
+  my $port   =  $ENV{SERVER_PORT};
   $port      =  undef if (($scheme eq 'http' ) && ($port == 80))
                       || (($scheme eq 'https') && ($port == 443));
 
@@ -479,7 +480,7 @@ sub header {
   );
 
   $self->{favicon} ||= "favicon.ico";
-  $self->{titlebar} = join ' - ', grep $_, $self->{title}, $self->{login}, $::myconfig{dbname}, $self->{version} if $self->{title};
+  $self->{titlebar} = join ' - ', grep $_, $self->{title}, $self->{login}, $::myconfig{dbname}, $self->{version} if $self->{title} || !$self->{titlebar};
 
   # build includes
   if ($self->{refresh_url} || $self->{refresh_time}) {