From 3766b0a3f649c7af19f9d932f7019ad7a6a7bbaa Mon Sep 17 00:00:00 2001
From: james <james>
Date: Tue, 31 Aug 2010 17:41:54 +0000
Subject: [PATCH] Fix navigation when loading a page that exists in the nav
 structure

---
 common.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.inc.php b/common.inc.php
index ebf3a1d..f7565cf 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -314,7 +314,7 @@ if(array_key_exists('users_id', $_SESSION)) {
 
 //take SFIABDIRECTORY off of the current URL
 $pageurl=substr($_SERVER['PHP_SELF'],strlen($config['SFIABDIRECTORY']));
-$q=mysql_query("SELECT * FROM rolestasks WHERE link='".mysql_real_escape_string($pageurl)."'");
+$q=mysql_query("SELECT * FROM rolestasks WHERE link='".mysql_real_escape_string($pageurl)."' AND conferencetype='{$conference['type']}'");
 if($r=mysql_fetch_object($q)) {
 	//okay we found it, now get its full tree above it
 	$navTree=array();