Refs #3178, surround first drop tables call in try-catch.

git-svn-id: http://dev.piwik.org/svn/trunk@6460 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 16 insertions, 2 deletions

diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php
index b6dbda3a37..e288fe0ea2 100644
--- a/plugins/Installation/FormDatabaseSetup.php
+++ b/plugins/Installation/FormDatabaseSetup.php
@@ -184,8 +184,22 @@ class Piwik_Installation_FormDatabaseSetup_Rule_checkUserPrivileges extends HTML
 		
 		$db = Zend_Registry::get('db');
 		
-		// try to drop tables before running privilege tests
-		$this->dropExtraTables($db);
+		try
+		{
+			// try to drop tables before running privilege tests
+			$this->dropExtraTables($db);
+		}
+		catch (Exception $ex)
+		{
+			if ($this->isAccessDenied($ex))
+			{
+				return false;
+			}
+			else
+			{
+				throw $ex;
+			}
+		}
 		
 		// check each required privilege by running a query that uses it
 		foreach (self::getRequiredPrivileges() as $privilegeType => $queries)