[Piwik-svn] r365 - trunk/modules

[svnmaster at piwik.org]

Author: matt
Date: 2008-03-12 18:00:23 +0100 (Wed, 12 Mar 2008)
New Revision: 365

Modified:
   trunk/modules/Access.php
Log:
- refs #136 end of fix hopefully

Modified: trunk/modules/Access.php
===================================================================
--- trunk/modules/Access.php	2008-03-12 11:38:26 UTC (rev 364)
+++ trunk/modules/Access.php	2008-03-12 17:00:23 UTC (rev 365)
@@ -100,8 +100,12 @@
 			else
 			{				
 				$db = Zend_Registry::get('db');
+				
+				// we join with site in case there are rows in access for an idsite that doesn't exist anymore
+				// (backward compatibility ; before we deleted the site without deleting rows in _access table)
 				$accessRaw = $db->fetchAll("SELECT access, idsite 
 								  FROM ".Piwik::prefixTable('access').
+									" JOIN ".Piwik::prefixTable('site')." USING (idsite) ".
 								" WHERE login=?", $this->identity);
 	
 				foreach($accessRaw as $access)