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 cbf0a41fdc53729aae1d6b087001c44acc59f551..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,26 +39,27 @@
 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.
+   * @return string
+   *   classname of BAO.
    */
   public function getBAOName() {
     return 'CRM_Batch_BAO_Batch';
   }
 
   /**
-   * Get action Links
+   * Get action Links.
    *
-   * @return array (reference) of action links
+   * @return array
+   *   (reference) of action links
    */
   public function &links() {
     if (!(self::$_links)) {
@@ -75,7 +76,6 @@ class CRM_Financial_Page_FinancialBatch extends CRM_Core_Page_Basic {
    * Finally it calls the parent's run method.
    *
    * @return void
-   *
    */
   public function run() {
     $context = CRM_Utils_Request::retrieve('context', 'String', $this);
@@ -89,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
@@ -98,18 +99,20 @@ 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.
+   * @return string
+   *   classname of edit form.
    */
   public function editForm() {
     return 'CRM_Financial_Form_FinancialBatch';
   }
 
   /**
-   * Get edit form name
+   * Get edit form name.
    *
-   * @return string name of this page.
+   * @return string
+   *   name of this page.
    */
   public function editName() {
     return 'Accounting Batch';
@@ -122,7 +125,8 @@ class CRM_Financial_Page_FinancialBatch extends CRM_Core_Page_Basic {
    *
    * @param null $mode
    *
-   * @return string user context.
+   * @return string
+   *   user context.
    */
   public function userContext($mode = NULL) {
     $context = $this->get("context");