[Jifty-commit] jifty branch, master, updated. 1.10518-68-g80ce185

[Jifty commits]

The branch, master has been updated
       via  80ce185bb11242a59abd08244497fa2b56b39ff4 (commit)
       via  ca8a824dcd9b166f3a7b3b4323a92f1f3e0a7983 (commit)
      from  ac3d21713bc04a6ed00131346588d9f733f9f703 (commit)

Summary of changes:
 lib/Jifty.pm                    |    2 +-
 lib/Jifty/Web/Form/Clickable.pm |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit ca8a824dcd9b166f3a7b3b4323a92f1f3e0a7983
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Feb 21 09:56:49 2012 -0500

    Append clickable query params _before_ any hash fragment
    
    Otherwise the query params become part of the fragment.

diff --git a/lib/Jifty/Web/Form/Clickable.pm b/lib/Jifty/Web/Form/Clickable.pm
index 3d1fc46..44127fb 100644
--- a/lib/Jifty/Web/Form/Clickable.pm
+++ b/lib/Jifty/Web/Form/Clickable.pm
@@ -477,9 +477,16 @@ sub complete_url {
     my %parameters = $self->get_parameters;
 
     my $url = $self->returns ? URI->new(Jifty->web->request->request_uri)->path : $self->url;
+
+    # XXX TODO: This should really construct a URI object and call some
+    # setters, but what's the perf hit there?  This method is used all over the
+    # place.
     if (%parameters) {
+        # The query string can't come after the hash fragment.
+        my $hash = $url =~ s/(#.*)$// ? $1 : '';
         $url .= ( $url =~ /\?/ ) ? ";" : "?";
         $url .= Jifty->web->query_string(%parameters);
+        $url .= $hash if $hash;
     }
 
     return $url;

commit 80ce185bb11242a59abd08244497fa2b56b39ff4
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Feb 21 10:16:54 2012 -0500

    Bump version for external deps

diff --git a/lib/Jifty.pm b/lib/Jifty.pm
index e74a2cb..2df006b 100644
--- a/lib/Jifty.pm
+++ b/lib/Jifty.pm
@@ -13,7 +13,7 @@ BEGIN {
     require Time::Local;
 
     # Declare early to make sure Jifty::Record::schema_version works
-    $Jifty::VERSION = '1.20213';
+    $Jifty::VERSION = '1.20221';
 }
 
 =head1 NAME

-----------------------------------------------------------------------