Merge branch 'master' of http://git.roojs.com/Pman.Core

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 19c0dd9..989e524 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -1200,12 +1200,14 @@ class Pman_Core_UpdateDatabase extends Pman
         $dburl = parse_url($ff->database);
         
         $dbtype = $dburl['scheme'];
-       
+        $dbtype  = ($dbtype == 'mysqli') ? 'mysql' : $dbtype;
+        
         foreach($this->extensions as $ext) {
        
             $scls = ucfirst($dbtype). $ext;
             $cls = __CLASS__ . '_'. $scls;
             $fn = implode('/',explode('_', $cls)).'.php';
+            
             if (!file_exists(__DIR__.'/UpdateDatabase/'. $scls .'.php')) {
                 return;
             }

diff --git a/sql/core_email.sql b/sql/core_email.sql
index 2f959af..b7e582f 100644 (file)
--- a/sql/core_email.sql
+++ b/sql/core_email.sql
@@ -36,6 +36,3 @@ ALTER TABLE core_email ADD INDEX lookup_owner_id (owner_id);
 
 UPDATE core_email SET updated_dt = NOW() where updated_dt IS NULL;
 
--- need to drop auto created triggers = as we modfied bcc-groupo _> bcc_grou_id
-DROP TRIGGER  IF EXISTS core_email_before_insert;
-DROP TRIGGER  IF EXISTS core_email_before_update;
\ No newline at end of file