From 5c981c774f533201d9f56aa3e2bc6d6a4bfdc596 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 8 Oct 2005 18:45:35 +0000
Subject: [PATCH] workaround for warning on sf.net

---
 ChangeLog                 | 4 ++++
 libraries/session.inc.php | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9d49592f3..356417df8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-10-08 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/session.inc.php: workaround for warnings on session_start()
+      displayed on sf.net server
+
 2005-10-08 Michal Čihař  <michal@cihar.com>
     * libraries/display_export.lib.php: Use same formatting for all options.
     * libraries/import/ldi.php: This one does not handle charset conversion.
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index 7f52a0897..8bd260d8b 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -41,8 +41,10 @@ if ( version_compare( PHP_VERSION, '5.0.0', 'ge' ) ) {
 }
 
 // start the session
-session_name( 'phpMyAdmin' );
-session_start();
+// on some servers (for example, sourceforge.net), we get a permission error
+// on the session data directory, so I add some "@"
+@session_name( 'phpMyAdmin' );
+@session_start();
 
 /**
  * trys to secure session from hijacking and fixation
@@ -62,4 +64,4 @@ function PMA_secureSession() {
         session_id( strip_tags( session_id() ) );
     }
 }
-?>
\ No newline at end of file
+?>