Merge pull request #3239 from eileenmcnaughton/whitespace-fixes

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

diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
index db210f66822f2fa22f5e1b59514cfcdd3e693c1a..e5e0c74455570aefd6418ab1e888994d5e0b70d0 100644 (file)
--- a/CRM/Mailing/Info.php
+++ b/CRM/Mailing/Info.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -31,7 +31,7 @@
  * abstract class.
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -78,7 +78,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
   }
 
   // docs inherited from interface
-  public function getPermissions() {
+  public function getPermissions($getAllUnconditionally = FALSE) {
     $permissions = array(
       'access CiviMail',
       'access CiviMail subscribe/unsubscribe pages',
@@ -86,7 +86,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
       'view public CiviMail content',
     );
 
-    if (self::workflowEnabled()) {
+    if (self::workflowEnabled() || $getAllUnconditionally) {
       $permissions[] = 'create mailings';
       $permissions[] = 'schedule mailings';
       $permissions[] = 'approve mailings';
@@ -109,8 +109,12 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
 
   // docs inherited from interface
   public function registerTab() {
-    // this component doesn't use contact record tabs
-    return NULL;
+    return array(
+      'title' => ts('Mailings'),
+      'id' => 'mailing',
+      'url' => 'mailing',
+      'weight' => 45,
+    );
   }
 
   // docs inherited from interface