From a59ad3ae1bd0b9bf773120074113f4a9cf19864f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 09 Jun 2010 09:31:02 -0400
Subject: [PATCH] Merged revisions 1806-1811,1816 from stable.

---
 interface/lib/classes/listform.inc.php |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index f385da6..7ac6f81 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -129,12 +129,17 @@
         //* Get config variable
         $list_name = $this->listDef['name'];
         $search_prefix = $this->listDef['search_prefix'];
+		
+		if(isset($_REQUEST['Filter']) && !isset($_SESSION['search'][$list_name])) {
+			//* Jump back to page 1 of the list when a new search gets started.
+			$_SESSION['search'][$list_name]['page'] = 0;
+		}
 
         //* store retrieval query
         foreach($this->listDef['item'] as $i) {
             $field = $i['field'];
 
-            //*TODO: comment =  hat sich die suche ge�ndert
+            //* The search string has been changed
             if(isset($_REQUEST[$search_prefix.$field]) && isset($_SESSION['search'][$list_name][$search_prefix.$field]) && $_REQUEST[$search_prefix.$field] != $_SESSION['search'][$list_name][$search_prefix.$field]){
                     $this->searchChanged = 1;
 					

--
Gitblit v1.9.1