From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 13 Jan 2011 10:37:58 +0000 (+0100)
Subject: Merge branch 'master' into rb-wiederkehrende-rechnungen
X-Git-Tag: release-2.6.3~61^2~9^2~3^2~15^2~29
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/f9c7abfae65b79945beb7e9260942bc94876248a?ds=inline;hp=-c

Merge branch 'master' into rb-wiederkehrende-rechnungen
---

f9c7abfae65b79945beb7e9260942bc94876248a
diff --combined SL/Form.pm
index 2dcd31f7c,8532c656f..e1646e69d
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@@ -48,7 -48,6 +48,7 @@@ use SL::Auth
  use SL::Auth::DB;
  use SL::Auth::LDAP;
  use SL::AM;
 +use SL::DB;
  use SL::Common;
  use SL::DBUtils;
  use SL::Mailer;
@@@ -680,7 -679,6 +680,6 @@@ EO
    print <<EOT;
    <link rel="stylesheet" href="css/jquery.autocomplete.css" type="text/css" />
    <meta name="robots" content="noindex,nofollow" />
-   <script type="text/javascript" src="js/highlight_input.js"></script>
    <link rel="stylesheet" type="text/css" href="css/tabcontent.css" />
    <script type="text/javascript" src="js/tabcontent.js">
  
@@@ -1581,7 -1579,7 +1580,7 @@@ sub get_standard_dbh 
      undef $standard_dbh;
    }
  
 -  $standard_dbh ||= $self->dbconnect_noauto($myconfig);
 +  $standard_dbh ||= SL::DB::create->dbh;
  
    $main::lxdebug->leave_sub(2);