From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 18 Jun 2013 11:01:21 +0000 (+0200)
Subject: Versionsnummer im Adminloginscreen immer richtig ausgeben
X-Git-Tag: release-3.1.0beta1~309^2~1
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e7c035b4ebd958d102907d6133ce1e6ef5448a0f;p=kivitendo-erp.git

Versionsnummer im Adminloginscreen immer richtig ausgeben
---

diff --git a/SL/Controller/Admin.pm b/SL/Controller/Admin.pm
index d633b98ca..6c62024d5 100644
--- a/SL/Controller/Admin.pm
+++ b/SL/Controller/Admin.pm
@@ -545,7 +545,8 @@ sub use_multiselect_js {
 
 sub login_form {
   my ($self, %params) = @_;
-  $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $::form->read_version), %params);
+  my $version         = $::form->read_version;
+  $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $version), %params, version => $version);
 }
 
 sub edit_user_form {
diff --git a/templates/webpages/admin/adminlogin.html b/templates/webpages/admin/adminlogin.html
index 80a78e8b9..c84e60239 100644
--- a/templates/webpages/admin/adminlogin.html
+++ b/templates/webpages/admin/adminlogin.html
@@ -6,7 +6,7 @@
    <tr>
     <td class="login" align="center">
      <a href="http://www.kivitendo.de" target="_top" class="no-underlined-links"><img src="image/kivitendo.png" border="0"></a>
-     <h1>[% LxERP.t8('kivitendo v#1 administration', FORM.version) %]</h1>
+     <h1>[% LxERP.t8('kivitendo v#1 administration', version) %]</h1>
 
 [% IF error %]
      <p><span class="message_error_login">[% HTML.escape(error) %]</span></p>