From 1c409348760fd16a8735271b65d526f68ad2ec07 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 16 Jul 2009 03:10:27 +0000
Subject: [PATCH] Fix a typo in the story link back to the archive, to limit
 display to only 1 keyword.

---
 docs/changelog/7.x.x.txt  | 1 +
 lib/WebGUI/Asset/Story.pm | 2 +-
 t/Asset/Story.t           | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 66122f32f..fe4fffcc7 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -19,6 +19,7 @@
   - fixed #10646: Asset History not paginated
   - fixed #10645: Asset History: search results not sorted as expected
   - fixed #10648: Story Topic: Photos don't display
+  - fixed #10649: Story Manager Keywords not working correctly
 
 7.7.14
  - fixed #10606: shelf selector
diff --git a/lib/WebGUI/Asset/Story.pm b/lib/WebGUI/Asset/Story.pm
index efda4cc29..2645cab9d 100644
--- a/lib/WebGUI/Asset/Story.pm
+++ b/lib/WebGUI/Asset/Story.pm
@@ -894,7 +894,7 @@ sub viewTemplateVariables {
     foreach my $keyword (@{ $keywords }) {
         push @{ $var->{keyword_loop} }, {
             keyword => $keyword,
-            url     => $archive->getUrl("func=view;keywords=".$session->url->escape($keyword)),
+            url     => $archive->getUrl("func=view;keyword=".$session->url->escape($keyword)),
         };
     }
     $var->{updatedTime}      = $self->formatDuration();
diff --git a/t/Asset/Story.t b/t/Asset/Story.t
index d3f13fdf7..d840055f4 100644
--- a/t/Asset/Story.t
+++ b/t/Asset/Story.t
@@ -332,9 +332,9 @@ is($viewVariables->{headline}, 'WebGUI, Web Done Right', '... headline is okay')
 cmp_bag(
     $viewVariables->{keyword_loop},
     [
-        { keyword => "foxtrot", url => '/home/test-archive?func=view;keywords=foxtrot', },
-        { keyword => "tango",   url => '/home/test-archive?func=view;keywords=tango', },
-        { keyword => "whiskey", url => '/home/test-archive?func=view;keywords=whiskey', },
+        { keyword => "foxtrot", url => '/home/test-archive?func=view;keyword=foxtrot', },
+        { keyword => "tango",   url => '/home/test-archive?func=view;keyword=tango', },
+        { keyword => "whiskey", url => '/home/test-archive?func=view;keyword=whiskey', },
     ],
     'viewTemplateVariables: keywords_loop is okay'
 );