CRM-19207
authortschuettler <tschuettler@oxfam.de>
Wed, 10 Aug 2016 09:46:40 +0000 (11:46 +0200)
committerGitHub <noreply@github.com>
Wed, 10 Aug 2016 09:46:40 +0000 (11:46 +0200)
Fix succeeding of checkTriggerViewPermission while have no CREATE VIEW permission

CRM/Core/DAO.php

index 70f7245ffbf9bbd1baeef78f4d21e78bcfdf2a6e..0d58d17772b28b4079d2235421f1a8717c331a32 100644 (file)
@@ -1884,8 +1884,8 @@ SELECT contact_id
     $errorScope = CRM_Core_TemporaryErrorScope::ignoreException();
     $dao = new CRM_Core_DAO();
     if ($view) {
-      $dao->query('CREATE OR REPLACE VIEW civicrm_domain_view AS SELECT * FROM civicrm_domain');
-      if (PEAR::getStaticProperty('DB_DataObject', 'lastError')) {
+      $result = $dao->query('CREATE OR REPLACE VIEW civicrm_domain_view AS SELECT * FROM civicrm_domain');
+      if (PEAR::getStaticProperty('DB_DataObject', 'lastError') || is_a($result, 'DB_Error')) {
         return FALSE;
       }
     }