From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 30 Dec 2010 15:19:53 +0000 (+0100)
Subject: Trennzeichen für Controller-Routing von :: auf / geändert
X-Git-Tag: release-2.6.2beta1~17^2~3^2~13
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=eb1efd213a130776d9f2068437e7d6e21f54dec5;p=kivitendo-erp.git

Trennzeichen für Controller-Routing von :: auf / geändert

Conflicts:

	templates/webpages/messages/form.html
	templates/webpages/messages/list.html
---

diff --git a/SL/Controller/Base.pm b/SL/Controller/Base.pm
index 06fd7fbdd..d9b1783ee 100644
--- a/SL/Controller/Base.pm
+++ b/SL/Controller/Base.pm
@@ -19,7 +19,7 @@ sub url_for {
   my %params      = @_;
   my $controller  = delete($params{controller}) || $self->_controller_name;
   my $action      = delete($params{action})     || 'dispatch';
-  $params{action} = "${controller}::${action}";
+  $params{action} = "${controller}/${action}";
   my $query       = join('&', map { $::form->escape($_) . '=' . $::form->escape($params{$_}) } keys %params);
 
   return "controller.pl?${query}";
diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index c412f6422..cc886d8ca 100644
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -282,7 +282,7 @@ sub _route_controller_request {
   my ($controller, $action);
 
   eval {
-    $::form->{action}      =~ m|^ ( [A-Z] [A-Za-z0-9_]* ) :: ( [a-z] [a-z0-9_]* ) $|x || die "Unroutable request -- inavlid controller/action.\n";
+    $::form->{action}      =~ m|^ ( [A-Z] [A-Za-z0-9_]* ) / ( [a-z] [a-z0-9_]* ) $|x || die "Unroutable request -- inavlid controller/action.\n";
     ($controller, $action) =  ($1, $2);
     delete $::form->{action};