From e5892a65fc5b44341b25ccd21e357fc681bbdca4 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 24 Jun 2009 21:18:00 +0000 Subject: [PATCH] Incorrect report of missing relational features --- ChangeLog | 1 + libraries/relation.lib.php | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d73a0305b..8f52671c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Tomas Srnka - tomassrnka - bug #1601625 [display] The Ignore checkbox is not unchecked for ENUM - bug #2809930 [setup] Notice: Undefined variable: k in setup/index.php +- bug [features] Incorrect report of missing relational features 3.2.0.0 (2009-06-15) - [core] better support for vendor customisation (based on what Debian needs) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 5b9235093..fcbde10e0 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -57,13 +57,14 @@ function PMA_getRelationsParam($verbose = false) $_SESSION['relation' . $GLOBALS['server']] = PMA__getRelationsParam(); } + // just for BC but needs to be before PMA_printRelationsParamDiagnostic() + // which uses it + $GLOBALS['cfgRelation'] = $_SESSION['relation' . $GLOBALS['server']]; + if ($verbose) { PMA_printRelationsParamDiagnostic($_SESSION['relation' . $GLOBALS['server']]); } - // just for BC - $GLOBALS['cfgRelation'] = $_SESSION['relation' . $GLOBALS['server']]; - return $_SESSION['relation' . $GLOBALS['server']]; }