X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=am.pl;h=2d1605253c6a4367cd8706a58d2e81af8bcd2ae7;hb=fa8921cae403c79443c1ae26eedb0164a49263fa;hp=e48b9790d9f00672dda13f8572d0d56399213a9c;hpb=799f6001bbb8de6cf080e0cec68c212d863d940f;p=kivitendo-erp.git

diff --git a/am.pl b/am.pl
index e48b9790d..2d1605253 100755
--- a/am.pl
+++ b/am.pl
@@ -31,7 +31,8 @@
 #######################################################################
 
 BEGIN {
-  push(@INC, "modules");
+  unshift @INC, "modules/YAML"; # Use our own version of YAML.
+  push @INC, "modules";         # Only use our own versions of modules if there's no system version.
 }
 
 # setup defaults, DO NOT CHANGE
@@ -77,6 +78,8 @@ $script =~ s/\.pl//;
 # pull in DBI
 use DBI;
 
+$form->{login} =~ s|.*/||;
+
 # check for user config file, could be missing or ???
 eval { require("$userspath/$form->{login}.conf"); };
 if ($@) {