From f1a3808b6dcdd7c7b88f5940314e8902e5cbb8f4 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Thu, 24 Nov 2011 14:31:09 +0000
Subject: [PATCH]  Bug in preference

---
 html/user_pref.php   | 15 ++-------------
 include/pref.inc.php |  6 ++++++
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/html/user_pref.php b/html/user_pref.php
index b8a5aef92..56336a5c9 100644
--- a/html/user_pref.php
+++ b/html/user_pref.php
@@ -87,19 +87,8 @@ if ( isset ($_POST['val']) )
 // comta style
 
 include_once ("user_menu.php");
-if ( isset ($_REQUEST['gDossier']) )
-{
-    if ( $_REQUEST['gDossier'] != 0 )
-    {
-        echo '<div class="u_tmenu">';
-        echo menu_tool('user_pref.php');
-        echo "</div>";
-    }
-}
-else
-{
-    echo "<h2 class=\"info\"> Pr&eacute;f&eacute;rences</h2>";
-}
+echo "<h2 class=\"info\"> Pr&eacute;f&eacute;rences</h2>";
+
 require_once("pref.inc.php");
 html_page_stop();
 ?>
diff --git a/include/pref.inc.php b/include/pref.inc.php
index 16ef9f0eb..fd7b3ee3a 100644
--- a/include/pref.inc.php
+++ b/include/pref.inc.php
@@ -33,6 +33,8 @@ echo '<DIV class="content">';
 //----------------------------------------------------------------------
 //
 global $g_user;
+$cn=Dossier::connect();
+$g_user=new User($cn);
 $inside_dossier = false;
 
 if (isset($_REQUEST['gDossier']))
@@ -218,7 +220,11 @@ if (isset($_POST['val']))
 	{
 	    echo HtmlInput::button_anchor(_('Retour'), 'user_login.php?');
 	}
+	else
+	  {
+	    echo HtmlInput::button_anchor(_('Retour'), 'do.php?'.Dossier::get());
 
+	  }
 
 
 	echo "</DIV>";