Merged master into dashboards2

2015-06-15 17:29:52 -04:00
parent 8d5ebb0d00 5b6dc0667e
commit 9ca3a7981c
25 changed files with 570 additions and 151 deletions
--- a/workflow/engine/classes/model/AppDelegation.php
+++ b/workflow/engine/classes/model/AppDelegation.php
@@ -188,8 +188,8 @@ class AppDelegation extends BaseAppDelegation
            if (PMLicensedFeatures
                ::getSingleton()
                ->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) {
-                G::LoadClass('actionsByEmail');
-                $actionsByEmail = new actionsByEmailClass();
+                G::LoadClass('actionsByEmailCore');
+                $actionsByEmail = new actionsByEmailCoreClass();
                $actionsByEmail->sendActionsByEmail($data);
            }
            /*----------------------------------********---------------------------------*/