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

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

diff --git a/CRM/Financial/Page/FinancialTypeAccount.php b/CRM/Financial/Page/FinancialTypeAccount.php
index b8d4ef470001f0861999704f3031a09f9b7a9e7f..caebcf5760c87e83fe15c0dbe9e2fd1bd659dc91 100644 (file)
--- a/CRM/Financial/Page/FinancialTypeAccount.php
+++ b/CRM/Financial/Page/FinancialTypeAccount.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$
  *
  */
@@ -38,23 +38,21 @@
  */
 class CRM_Financial_Page_FinancialTypeAccount extends CRM_Core_Page {
   /**
-   * 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;
 
   /**
-   * The account id that we need to display for the browse screen
+   * The account id that we need to display for the browse screen.
    *
    * @var array
-   * @static
    */
   protected $_aid = NULL;
 
   /**
-   * Get BAO Name
+   * Get BAO Name.
    *
    * @return string
    *   Classname of BAO.
@@ -64,7 +62,7 @@ class CRM_Financial_Page_FinancialTypeAccount extends CRM_Core_Page {
   }
 
   /**
-   * Get action Links
+   * Get action Links.
    *
    * @return array
    *   (reference) of action links
@@ -72,13 +70,13 @@ class CRM_Financial_Page_FinancialTypeAccount extends CRM_Core_Page {
   public function &links() {
     if (!(self::$_links)) {
       self::$_links = array(
-        CRM_Core_Action::UPDATE  => array(
+        CRM_Core_Action::UPDATE => array(
           'name' => ts('Edit'),
           'url' => 'civicrm/admin/financial/financialType/accounts',
           'qs' => 'action=update&id=%%id%%&aid=%%aid%%&reset=1',
           'title' => ts('Edit Financial Type Account'),
         ),
-        CRM_Core_Action::DELETE  => array(
+        CRM_Core_Action::DELETE => array(
           'name' => ts('Delete'),
           'url' => 'civicrm/admin/financial/financialType/accounts',
           'qs' => 'action=delete&id=%%id%%&aid=%%aid%%',
@@ -120,10 +118,9 @@ class CRM_Financial_Page_FinancialTypeAccount extends CRM_Core_Page {
   }
 
   /**
-   * Browse all Financial Type Account data
+   * Browse all Financial Type Account data.
    *
    * @return void
-   * @static
    */
   public function browse() {
     // get all Financial Type Account data sorted by weight
@@ -220,4 +217,5 @@ class CRM_Financial_Page_FinancialTypeAccount extends CRM_Core_Page {
     $controller->process();
     $controller->run();
   }
+
 }