Merge pull request #11635 from civicrm/4.7.30-rc

[civicrm-core.git] / CRM / Member / Task.php

diff --git a/CRM/Member/Task.php b/CRM/Member/Task.php
index df91d1b0eb61bc72e6834327c48a0c431f1b8ec6..d20859a8850d4fa186a190b302765f6bf318118f 100644 (file)
--- a/CRM/Member/Task.php
+++ b/CRM/Member/Task.php
@@ -85,7 +85,10 @@ class CRM_Member_Task {
           'result' => FALSE,
         ),
         4 => array(
-          'title' => ts('Email - send now'),
+          'title' => ts('Email - send now (to %1 or less)', array(
+            1 => Civi::settings()
+              ->get('simple_mail_limit'),
+          )),
           'class' => 'CRM_Member_Form_Task_Email',
           'result' => TRUE,
         ),
@@ -119,9 +122,11 @@ class CRM_Member_Task {
       if (!CRM_Core_Permission::check('edit memberships')) {
         unset(self::$_tasks[5]);
       }
+
+      CRM_Utils_Hook::searchTasks('membership', self::$_tasks);
+      asort(self::$_tasks);
     }
-    CRM_Utils_Hook::searchTasks('membership', self::$_tasks);
-    asort(self::$_tasks);
+
     return self::$_tasks;
   }