From 5a25a44221d1d9fc0deae862327424c58f4db0d7 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sun, 6 Dec 2009 14:57:08 -0800
Subject: [PATCH] Made Asset Manager search too sticky.

---
 docs/changelog/7.x.x.txt           | 1 +
 lib/WebGUI/Content/AssetManager.pm | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index e7868e9a2..a90db0522 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.8.8
  - fixed #11289: Gallery with pending version tag causes search engine indexer to puke.
+ - fixed #11292: Search function limited to onje search?
 
 7.8.7
  - fixed #11278: Wrong test for Template::Toolkit in testEnvironment.pl
diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm
index 9c0c58a59..3eea68663 100644
--- a/lib/WebGUI/Content/AssetManager.pm
+++ b/lib/WebGUI/Content/AssetManager.pm
@@ -145,7 +145,7 @@ sub getSearchPaginator {
         $queryString    .= ';class=' . $class;
     }
 
-    my $pageNumber  = $session->scratch->get('assetManagerSearchPageNumber') || $session->form->get('pn');
+    my $pageNumber  = $session->form->get('pn') || $session->scratch->get('assetManagerSearchPageNumber');
     my $p           = $s->getPaginatorResultSet( $session->url->page( $queryString ), undef, $pageNumber );
 
     $session->scratch->set('assetManagerSearchPageNumber', $pageNumber);
@@ -538,7 +538,7 @@ sub www_search {
     $session->style->setScript( $session->url->extras( 'yui/build/yahoo-dom-event/yahoo-dom-event.js' ) );
     $session->style->setScript( $session->url->extras( 'yui-webgui/build/assetManager/assetManager.js' ) );
     $session->style->setScript( $session->url->extras( 'yui-webgui/build/form/form.js' ) );
-    my $keywords = $session->scratch->get('assetManagerSearchKeywords') || $session->form->get('keywords');
+    my $keywords =  $session->form->get('keywords') || $session->scratch->get('assetManagerSearchKeywords');
 
     ### Show the form
     $output     .= q{<form method="post" enctype="multipart/form-data" action="} . $currentAsset->getUrl . q{"><p>}