Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-14-11-04-09

[civicrm-core.git] / CRM / Mailing / Info.php

diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
index de3f23678b6b329ded33d5089000ede214fd58e3..237b2ce129a986adde2a5b2d65dfcdf463adaa4a 100644 (file)
--- a/CRM/Mailing/Info.php
+++ b/CRM/Mailing/Info.php
@@ -63,6 +63,15 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
    * @see CRM_Utils_Hook::angularModules
    */
   public function getAngularModules() {
+    // load angular files only if valid permissions are granted to the user
+    if (!CRM_Core_Permission::check('access CiviMail')
+      || !CRM_Core_Permission::check('create mailings')
+      || !CRM_Core_Permission::check('schedule mailings')
+      || !CRM_Core_Permission::check('approve mailings')
+    ) {
+      return array();
+    }
+
     $result = array();
     $result['crmMailing'] = array(
       'ext' => 'civicrm',