[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24013-g63ffeeb

[Marc Delisle]

The branch, master has been updated
       via  63ffeebcf8ff87a380af397a8cb2cbc2b985622a (commit)
       via  d68c8bb8ed1eea827e15041351f27089db7b679d (commit)
      from  ce3a581ae7ce54ac42eedb3721cbd33adc94f0a2 (commit)


- Log -----------------------------------------------------------------
commit 63ffeebcf8ff87a380af397a8cb2cbc2b985622a
Merge: ce3a581 d68c8bb
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Dec 5 11:04:28 2011 -0500

    Merge branch 'QA_3_4'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                 |    1 +
 libraries/session.inc.php |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc69949..28b40c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,6 +67,7 @@ phpMyAdmin - ChangeLog
 - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown
 - bug #3442004 [interface] DB suggestion not correct for user with underscore
 - bug #3438420 [core] Magic quotes removed in PHP 5.4
+- bug #3398788 [session] No feedback when result is empty (signon auth_type)
 
 3.4.8.0 (2011-12-01)
 - bug #3425230 [interface] enum data split at space char (more space to edit)
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index b4a6b94..e992db2 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -41,7 +41,8 @@ if (!empty($path)) {
 
 // but not all user allow cookies
 @ini_set('session.use_only_cookies', false);
- at ini_set('session.use_trans_sid', true);
+// do not force transparent session ids, see bug #3398788
+//@ini_set('session.use_trans_sid', true);
 @ini_set('url_rewriter.tags',
     'a=href,frame=src,input=src,form=fakeentry,fieldset=');
 //ini_set('arg_separator.output', '&');


hooks/post-receive
-- 
phpMyAdmin