From 91dee4238c0e584afa470287b2c69127d54f8998 Mon Sep 17 00:00:00 2001 From: Marc Delisle 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 0c5ff6945a..d584011609 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,7 +60,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 16dfb64656..f12dfb8c85 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(); } -- 2.11.4.GIT