backport

Patches applied:

 * opensource@polytechnique.org--2005/platal--release--0.9.3--patch-4
   fix deco bug (XdX v2)

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-152

diff --git a/htdocs/deconnexion.php b/htdocs/deconnexion.php
index 5f95d22..49f29f9 100644 (file)
--- a/htdocs/deconnexion.php
+++ b/htdocs/deconnexion.php
@@ -28,8 +28,7 @@ if (isset($_SESSION['log'])) {
     $_SESSION['log']->log('deconnexion',$ref);
 }
 
-session_destroy();
-$_SESSION = array();
+XorgSession::destroy();
 if(isset($_COOKIE['ORGaccess']) && isset($_COOKIE['ORGuid'])) {
     header('Location: login.php');
 }

diff --git a/include/xorg/session.inc.php b/include/xorg/session.inc.php
index 9fd487a..358d16c 100644 (file)
--- a/include/xorg/session.inc.php
+++ b/include/xorg/session.inc.php
@@ -48,6 +48,15 @@ class XorgSession extends DiogenesCoreSession
     }
     
     // }}}
+    // {{{ function destroy()
+    
+    function destroy() {
+        @session_destroy();
+        unset($_SESSION);
+        XorgSession::init();
+    }
+    
+    // }}}
     // {{{ function doAuth()
 
     /** Try to do an authentication.