Merge pull request #4693 from jaapjansma/CRM-15702

[civicrm-core.git] / CRM / Event / Form / ManageEvent / TabHeader.php

diff --git a/CRM/Event/Form/ManageEvent/TabHeader.php b/CRM/Event/Form/ManageEvent/TabHeader.php
index 66fdd03fdc97b08d3e4389745fccdacb7d7acaaf..7beb7deaa707c9720b7f803c7a72581e61c9e4a6 100644 (file)
--- a/CRM/Event/Form/ManageEvent/TabHeader.php
+++ b/CRM/Event/Form/ManageEvent/TabHeader.php
@@ -39,7 +39,7 @@
 class CRM_Event_Form_ManageEvent_TabHeader {
 
   /**
-   * @param $form
+   * @param CRM_Core_Form $form
    *
    * @return array
    */
@@ -51,7 +51,7 @@ class CRM_Event_Form_ManageEvent_TabHeader {
     }
     $form->assign_by_ref('tabHeader', $tabs);
     CRM_Core_Resources::singleton()
-      ->addScriptFile('civicrm', 'templates/CRM/common/TabHeader.js')
+      ->addScriptFile('civicrm', 'templates/CRM/common/TabHeader.js', 1, 'html-header')
       ->addSetting(array('tabSettings' => array(
         'active' => self::getCurrentTab($tabs),
       )));
@@ -60,7 +60,7 @@ class CRM_Event_Form_ManageEvent_TabHeader {
   }
 
   /**
-   * @param $form
+   * @param CRM_Core_Form $form
    *
    * @return array
    * @throws Exception
@@ -151,6 +151,8 @@ WHERE      e.id = %1
     $fullName  = $form->getVar('_name');
     $className = CRM_Utils_String::getClassName($fullName);
     $new       = '';
+    $action = 'update';
+
     // hack for special cases.
     switch ($className) {
       case 'Event':
@@ -164,7 +166,6 @@ WHERE      e.id = %1
 
       case 'ScheduleReminders':
         $class = 'reminder';
-        $new = !empty($_GET['new']) ? '&new=1' : '';
         break;
 
       default:
@@ -188,8 +189,12 @@ WHERE      e.id = %1
           $tabs[$key]['qfKey'] = NULL;
         }
 
+        if ($key == 'reminder') {
+          $action = 'browse';
+        }
+
         $tabs[$key]['link'] = CRM_Utils_System::url("civicrm/event/manage/{$key}",
-          "{$reset}action=update&id={$eventID}&component=event{$new}{$tabs[$key]['qfKey']}"
+          "{$reset}action={$action}&id={$eventID}&component=event{$tabs[$key]['qfKey']}"
         );
       }
     }
@@ -230,4 +235,3 @@ WHERE      e.id = %1
     return $current;
   }
 }
-