From 4413613d14675a7b9cf567e6cd975fb5a2be3a2b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Oct 2012 11:56:39 +0200
Subject: [PATCH] Another better fix.

---
 htdocs/install/etape1.php   | 4 ++--
 htdocs/user/group/index.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index 70c3f3e5c7f..2e494422048 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -30,7 +30,7 @@ define('DONOTLOADCONF',1);	// To avoid loading conf by file inc.php
 include 'inc.php';
 
 $action=GETPOST('action','alpha');
-$setuplang=(GETPOST('selectlang')?GETPOST('selectlang'):'auto');
+$setuplang=(GETPOST('selectlang','',3)?GETPOST('selectlang','',3):'auto');
 $langs->setDefaultLang($setuplang);
 
 $langs->load("admin");
@@ -409,7 +409,7 @@ if (! $error && $db->connected && $action == "set")
     }
 
     // Table prefix
-    $main_db_prefix = ((! empty($db_prefix) && $db_prefix != '') ? $db_prefix : 'llx_');
+    $main_db_prefix = (! empty($db_prefix) ? $db_prefix : 'llx_');
 
     // Force https
     $main_force_https = ((GETPOST("main_force_https") && (GETPOST("main_force_https") == "on" || GETPOST("main_force_https") == 1)) ? '1' : '0');
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index 87ac410f07f..6f73f2e7c33 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -82,7 +82,7 @@ if ($resql)
     $num = $db->num_rows($resql);
     $i = 0;
 
-    $param="search_group=".urlencode($search_group)."&amp;sall=".urlencode($sall);
+    $param="&search_group=".urlencode($search_group)."&amp;sall=".urlencode($sall);
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans("Group"),$_SERVER["PHP_SELF"],"g.nom",$param,"","",$sortfield,$sortorder);