Merge pull request #3649 from colemanw/totten-colemanw-validate

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

diff --git a/CRM/Admin/Page/MessageTemplates.php b/CRM/Admin/Page/MessageTemplates.php
index d9a75806e53eaf652a555d2b89fb5472de868a89..44d4f0b0c2c792dd11e19d991968c73eca15cbd8 100644 (file)
--- a/CRM/Admin/Page/MessageTemplates.php
+++ b/CRM/Admin/Page/MessageTemplates.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -52,6 +52,10 @@ class CRM_Admin_Page_MessageTemplates extends CRM_Core_Page_Basic {
   // set to the id that we’re reverting at the given moment (if we are)
   protected $_revertedId;
 
+  /**
+   * @param null $title
+   * @param null $mode
+   */
   function __construct($title = NULL, $mode = NULL) {
     parent::__construct($title, $mode);
 
@@ -132,6 +136,14 @@ class CRM_Admin_Page_MessageTemplates extends CRM_Core_Page_Basic {
     return self::$_links;
   }
 
+  /**
+   * @param CRM_Core_DAO $object
+   * @param int $action
+   * @param array $values
+   * @param array $links
+   * @param string $permission
+   * @param bool $forceAction
+   */
   function action(&$object, $action, &$values, &$links, $permission, $forceAction = FALSE) {
     if ($object->workflow_id) {
       // do not expose action link for reverting to default if the template did not diverge or we just reverted it now
@@ -168,6 +180,13 @@ class CRM_Admin_Page_MessageTemplates extends CRM_Core_Page_Basic {
     }
   }
 
+  /**
+   * @param null $args
+   * @param null $pageArgs
+   * @param null $sort
+   *
+   * @throws Exception
+   */
   function run($args = NULL, $pageArgs = NULL, $sort = NULL) {
     // handle the revert action and offload the rest to parent
     if (CRM_Utils_Request::retrieve('action', 'String', $this) & CRM_Core_Action::REVERT) {
@@ -208,6 +227,8 @@ class CRM_Admin_Page_MessageTemplates extends CRM_Core_Page_Basic {
   /**
    * Get user context.
    *
+   * @param null $mode
+   *
    * @return string user context.
    */
   function userContext($mode = NULL) {
@@ -217,13 +238,12 @@ class CRM_Admin_Page_MessageTemplates extends CRM_Core_Page_Basic {
   /**
    * browse all entities.
    *
-   * @param int $action
+   * @internal param int $action
    *
    * @return void
    * @access public
    */
   function browse() {
-    CRM_Core_Resources::singleton()->addScriptFile('civicrm', 'js/crm.livePage.js');
     $action = func_num_args() ? func_get_arg(0) : NULL;
     if ($this->_action & CRM_Core_Action::ADD) {
       return;