Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-14-11-04-09

[civicrm-core.git] / CRM / Financial / Page / FinancialBatch.php

diff --git a/CRM/Financial/Page/FinancialBatch.php b/CRM/Financial/Page/FinancialBatch.php
index 69f16a72cdb6409905c414e13ceec750ba1b211e..c17d467553dd1a02abf29682c12548e41febb431 100644 (file)
--- a/CRM/Financial/Page/FinancialBatch.php
+++ b/CRM/Financial/Page/FinancialBatch.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,12 +23,12 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -39,15 +39,14 @@
 class CRM_Financial_Page_FinancialBatch extends CRM_Core_Page_Basic {
 
   /**
-   * The action links that we need to display for the browse screen
+   * The action links that we need to display for the browse screen.
    *
    * @var array
-   * @static
    */
   static $_links = NULL;
 
   /**
-   * Get BAO Name
+   * Get BAO Name.
    *
    * @return string
    *   classname of BAO.
@@ -57,7 +56,7 @@ class CRM_Financial_Page_FinancialBatch extends CRM_Core_Page_Basic {
   }
 
   /**
-   * Get action Links
+   * Get action Links.
    *
    * @return array
    *   (reference) of action links
@@ -90,7 +89,8 @@ class CRM_Financial_Page_FinancialBatch extends CRM_Core_Page_Basic {
         CRM_Core_Action::ADD |
         CRM_Core_Action::CLOSE |
         CRM_Core_Action::REOPEN |
-        CRM_Core_Action::EXPORT)) {
+        CRM_Core_Action::EXPORT)
+    ) {
       $this->edit($action, $id);
     }
     // parent run
@@ -99,7 +99,7 @@ class CRM_Financial_Page_FinancialBatch extends CRM_Core_Page_Basic {
 
 
   /**
-   * Get name of edit form
+   * Get name of edit form.
    *
    * @return string
    *   classname of edit form.
@@ -109,7 +109,7 @@ class CRM_Financial_Page_FinancialBatch extends CRM_Core_Page_Basic {
   }
 
   /**
-   * Get edit form name
+   * Get edit form name.
    *
    * @return string
    *   name of this page.