[Jifty-commit] r5747 - in jifty/trunk: lib/Jifty/Web lib/Jifty/Web/Form
Jifty commits
jifty-commit at lists.jifty.org
Mon Aug 18 19:27:39 EDT 2008
Author: alexmv
Date: Mon Aug 18 19:27:39 2008
New Revision: 5747
Modified:
jifty/trunk/ (props changed)
jifty/trunk/lib/Jifty/Web/Form.pm
jifty/trunk/lib/Jifty/Web/Form/Link.pm
Log:
r36174 at kohr-ah: chmrr | 2008-08-18 19:27:26 -0400
* PATH_INFO is already unescaped one level -- use REQUEST_URI
Modified: jifty/trunk/lib/Jifty/Web/Form.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form.pm (original)
+++ jifty/trunk/lib/Jifty/Web/Form.pm Mon Aug 18 19:27:39 2008
@@ -199,7 +199,9 @@
}
}
- my $form_start = qq!<form method="post" action="! . Jifty->web->escape( $self->submit_to || $ENV{PATH_INFO}) . qq!"!;
+ my $root = $self->submit_to;
+ ($root) = $ENV{'REQUEST_URI'} =~ /([^\?]*)/ unless defined $root;
+ my $form_start = qq!<form method="post" action="! . Jifty->web->escape( $root ) . qq!"!;
$form_start .= qq! name="@{[ $self->name ]}"! if defined $self->name;
$form_start .= qq! target="@{[ $self->target ]}"! if defined $self->target;
$form_start .= qq! autocomplete="off"! if defined $self->disable_autocomplete;
Modified: jifty/trunk/lib/Jifty/Web/Form/Link.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Link.pm (original)
+++ jifty/trunk/lib/Jifty/Web/Form/Link.pm Mon Aug 18 19:27:39 2008
@@ -69,8 +69,9 @@
sub new {
my $class = shift;
my $args = ref($_[0]) ? $_[0] : {@_};
+ my ($root) = $ENV{'REQUEST_URI'} =~ /([^\?]*)/;
my $self = $class->SUPER::new(
- { url => $ENV{PATH_INFO},
+ { url => $root,
label => "Click me!",
tooltip => undef,
escape_label => 1,
More information about the Jifty-commit
mailing list