--- mambo/branches/4.6/includes/mambo.php	2006/02/16 21:43:38	297
+++ mambo/branches/4.6/includes/mambo.php	2006/05/16 09:44:41	516
@@ -234,7 +234,7 @@
 
 	function getJointPermissions ($access_type, $access_id, $role) {
 		$sql = "SELECT p2.control AS hiscontrol, p1.control AS mycontrol, p1.action, p1.subject_type, p1.subject_id"
-		." FROM `mos_assignments` AS a, `mos_permissions` AS p1 LEFT JOIN `mos_permissions` AS p2"
+		." FROM `#__assignments` AS a, `#__permissions` AS p1 LEFT JOIN `#__permissions` AS p2"
 		." ON (p2.role='$role' AND p1.action=p2.action AND p1.subject_type=p2.subject_type AND p1.subject_id=p2.subject_id)"
 		." WHERE  (p1.control&1) AND p1.role=a.role AND a.access_type='$access_type' AND (a.access_id='$access_id' OR a.access_id='*')";
 		$this->doSQL($sql);