[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6483-g0f39dc0

[Michal Čihař]

The branch, master has been updated
       via  0f39dc040ab9287f17ca267e84078748c7f96f62 (commit)
       via  e8cf1ac6773cf868ff79ed286494ea13b58da528 (commit)
      from  87fb4ea4cac849394d5acd434b0b64e03e8e088e (commit)


- Log -----------------------------------------------------------------
commit 0f39dc040ab9287f17ca267e84078748c7f96f62
Merge: 87fb4ea4cac849394d5acd434b0b64e03e8e088e e8cf1ac6773cf868ff79ed286494ea13b58da528
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Aug 17 15:31:06 2010 +0200

    Merge branch 'QA_3_3'

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

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

diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index 551668d..4f8caec 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -110,5 +110,6 @@ function PMA_secureSession()
 {
     // prevent session fixation and XSS
     session_regenerate_id(true);
+    $_SESSION[' PMA_token '] = md5(uniqid(rand(), true));
 }
 ?>


hooks/post-receive
-- 
phpMyAdmin