From c343434849fb8056d94de72e13df42c09426cc71 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 859e2fccf..04edd1ba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,7 +65,6 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2926613 [edit] Copy database shows errors when DB has foreign key
 
 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 433183b78..83ed2169e 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();
         }