From eb1efd213a130776d9f2068437e7d6e21f54dec5 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 30 Dec 2010 16:19:53 +0100 Subject: [PATCH] =?utf8?q?Trennzeichen=20f=C3=BCr=20Controller-Routing=20v?= =?utf8?q?on=20::=20auf=20/=20ge=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Conflicts: templates/webpages/messages/form.html templates/webpages/messages/list.html --- SL/Controller/Base.pm | 2 +- SL/Dispatcher.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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}; -- 2.20.1