From eb23564031b0fc9932b61314ae7116e7f703667d Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 21 Jan 2010 00:36:27 +0000
Subject: [PATCH] revert fix for bug #2931216

---
 ChangeLog                  | 1 -
 libraries/Config.class.php | 1 -
 2 files changed, 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 36aa8c7bf..753355ecc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,6 @@ $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
 3.2.6.0 (not yet released)
-- bug #2931216 [config] Relations settings not updated on config change 
 
 3.2.5.0 (2010-01-10)
 - patch #2903400 [bookmarks] Status of bookmark table, 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index e62bb1566..158918f73 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -311,7 +311,6 @@ class PMA_Config
           || $this->error_config_file
           || $this->error_config_default_file) {
             $this->settings = array();
-            unset($_SESSION['relation']);
             $this->load();
             $this->checkSystem();
         }