Merge von 796 aus unstable: Bugfix

Syntag Error in User.pm

diff --git a/SL/User.pm b/SL/User.pm
index f1ba06a0c2a70a364cffcb90f6d5f068fb8b1b7b..39d40c4e32f7aabf781c98d9fc6e83abb813f97a 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -654,7 +654,7 @@ sub dbupdate {
   if ($form->{dbupdate}) {
 
     # read update scripts into memory
   if ($form->{dbupdate}) {
 
     # read update scripts into memory

-    opendir SQLDIR, "sql/." or $form - error($!);
+    opendir SQLDIR, "sql/." or &error("", "$!");

     ## LINET
     @upgradescripts =
       sort(cmp_script_version
     ## LINET
     @upgradescripts =
       sort(cmp_script_version