From f704f14134ad12f0e947aef90b5bc4c7dc89ad85 Mon Sep 17 00:00:00 2001
From: james <james>
Date: Wed, 21 Jul 2010 15:16:39 +0000
Subject: [PATCH] make sure user_load is called in the right directory unset
 session navigation when switching conferences

---
 common.inc.bootstrap.php | 1 +
 common.inc.php           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/common.inc.bootstrap.php b/common.inc.bootstrap.php
index a374b99..9157264 100644
--- a/common.inc.bootstrap.php
+++ b/common.inc.bootstrap.php
@@ -203,6 +203,7 @@ if(isset($_GET['switchconference'])) {
 	if($r=mysql_fetch_object($q)) {
 		$_SESSION['conferences_id']=$cid;
 	}
+	unset($_SESSION['nav']);
 }
 
 if(intval($_SESSION['conferences_id'])>0) {
diff --git a/common.inc.php b/common.inc.php
index d0aff96..ca98089 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -147,7 +147,7 @@ if(!$_SESSION['conferences_id']) {
 			 $cl="class=\"selected\"";
 		 else
 			 $cl="";
-		 echo "<li $cl><a $cl href=\"user_login.php?action=switchconference&switchconference=$r->id\">$r->name</a></li>\n";
+		 echo "<li $cl><a $cl href=\"{$config['SFIABDIRECTORY']}/user_login.php?action=switchconference&switchconference=$r->id\">$r->name</a></li>\n";
 	 }
 	 echo "</ul>\n";
  }