Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-18-07-54-54

[civicrm-core.git] / CRM / Admin / Page / MailSettings.php

diff --git a/CRM/Admin/Page/MailSettings.php b/CRM/Admin/Page/MailSettings.php
index ed38e1bb8bfc8e534a1d4b319ccbf5cfbbdff23e..37dcf2b549535d1027a43435e0d139ae44a38453 100644 (file)
--- a/CRM/Admin/Page/MailSettings.php
+++ b/CRM/Admin/Page/MailSettings.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -116,7 +116,12 @@ class CRM_Admin_Page_MailSettings extends CRM_Core_Page_Basic {
 
       //add action links.
       $allMailSettings[$mailSetting->id]['action'] = CRM_Core_Action::formLink(self::links(), $action,
-        array('id' => $mailSetting->id)
+        array('id' => $mailSetting->id),
+        ts('more'),
+        FALSE,
+        'mailSetting.manage.action',
+        'MailSetting',
+        $mailSetting->id
       );
     }