From: x2000habouzit <x2000habouzit>
Date: Sat, 9 Oct 2004 10:05:01 +0000 (+0000)
Subject: really fix sophie's problem
X-Git-Tag: xorg/old~1383
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=2ffa0650b3bf2bf0162159f7d9ded7941545f73b;p=platal.git

really fix sophie's problem
---

diff --git a/include/xorg.session.inc.php b/include/xorg.session.inc.php
index 98cf9e1..3fb23e6 100644
--- a/include/xorg.session.inc.php
+++ b/include/xorg.session.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: xorg.session.inc.php,v 1.29 2004-10-09 09:34:15 x2000habouzit Exp $
+        $Id: xorg.session.inc.php,v 1.30 2004-10-09 10:05:01 x2000habouzit Exp $
  ***************************************************************************/
 
 require("diogenes.core.session.inc.php");
@@ -107,14 +107,15 @@ class XorgSession extends DiogenesCoreSession {
     /** Display login screen.
      */
     function doLogin(&$page, $new_name=false) {
-        $page->caching = false;
 	if(isset($_COOKIE['ORGaccess']) and isset($_COOKIE['ORGuid']) and !$new_name) {
 	    $page->changeTpl('password_prompt_logged.tpl');
+	    $page->caching = false;
 	    $page->assign("xorg_head", "password_prompt_logged.head.tpl");
 	    $page->assign("xorg_tpl", "password_prompt_logged.tpl");
 	    $page->run();
 	} else {
 	    $page->changeTpl('password_prompt.tpl');
+	    $page->caching = false;
 	    $page->assign("xorg_head", "password_prompt.head.tpl");
 	    $page->assign("xorg_tpl", "password_prompt.tpl");
 	    $page->run();