Konflikt zwischen zwei Upgrade-Scripten beheben

[mfinanz.git] / bin / mozilla / admin.pl

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 3d32a3978fcc5e3d22ac4c767c6ea0f3c61eeda9..84c8b069954e2813acdc351dc9760ef1cd84cddb 100755 (executable)
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -98,7 +98,7 @@ sub run {
   if ($form->{action}) {
     if ($auth->authenticate_root($form->{'{AUTH}admin_password'}) != $auth->OK()) {
       $auth->punish_wrong_login;
-      $form->{error_message} = $locale->text('Incorrect Password!');
+      $form->{error} = $locale->text('Incorrect Password!');
       $auth->delete_session_value('admin_password');
       adminlogin();
     } else {
@@ -780,6 +780,7 @@ sub dbcreate {
   my $locale = $main::locale;
 
   $form->isblank("db", $locale->text('Dataset missing!'));
+  $form->isblank("defaultcurrency", $locale->text('Default currency missing!'));
 
   User->dbcreate(\%$form);
 
@@ -1178,7 +1179,7 @@ sub _search_templates {
        -d ($::lx_office_conf{paths}->{templates} . "/$_")
     && !/^\.\.?$/
     && !m/\.(?:html|tex|sty|odt|xml|txb)$/
-    && !m/^(?:webpages$|print$|\.)/
+    && !m/^(?:webpages$|print$|mail$|\.)/
   } keys %dir_h;
 
   tie %dir_h, 'IO::Dir', "$::lx_office_conf{paths}->{templates}/print";