Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1136)
+++ branches/2.8.x/CHANGELOG	(revision 1137)
@@ -10,6 +10,10 @@
 # = Bugfix
 ! = Update/Change
 
+------------------------------------- 2.8.1 -------------------------------------
+22-Aug-2009 Ruud Eisinga
+# 	Changed the default searchform name in the installer. (ticket #775)
+#	Fixed the recursive redirect problem when a page is called with a wrong language parm (ticket #780)
 ------------------------------------- 2.8.0 -------------------------------------
 14-Aug-2009 Matthias Gallas
 #	Fixed typo in dutch language file (Thanks to Argos)
Index: branches/2.8.x/wb/framework/class.frontend.php
===================================================================
--- branches/2.8.x/wb/framework/class.frontend.php	(revision 1136)
+++ branches/2.8.x/wb/framework/class.frontend.php	(revision 1137)
@@ -144,7 +144,7 @@
 			// Check if the page language is also the selected language. If not, send headers again.
 			if ($this->page['language']!=LANGUAGE) {
 				if(isset($_SERVER['QUERY_STRING']) && $_SERVER['QUERY_STRING'] != '') { // check if there is an query-string
-					header('Location: '.$this->page_link($this->page['link']).'?lang='.$this->page['language'].'&'.$_SERVER['QUERY_STRING']);
+					header('Location: '.$this->page_link($this->page['link']).'?'.$_SERVER['QUERY_STRING'].'&lang='.$this->page['language']);
 				} else {
 					header('Location: '.$this->page_link($this->page['link']).'?lang='.$this->page['language']);
 				}
Index: branches/2.8.x/wb/install/save.php
===================================================================
--- branches/2.8.x/wb/install/save.php	(revision 1136)
+++ branches/2.8.x/wb/install/save.php	(revision 1137)
@@ -569,7 +569,7 @@
 	$search_header = addslashes('
 <h1>[TEXT_SEARCH]</h1>
 
-<form name="search" action="[WB_URL]/search/index.php" method="get">
+<form name="searchpage" action="[WB_URL]/search/index.php" method="get">
 <table cellpadding="3" cellspacing="0" border="0" width="500">
 <tr>
 <td>
