Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-03-23-18-42-19

[civicrm-core.git] / CRM / Batch / Page / Batch.php

diff --git a/CRM/Batch/Page/Batch.php b/CRM/Batch/Page/Batch.php
index a4ff19fa38d8218c786e0fac2c03d73725945fbf..87c5e5180589e4b2144019a1512c7a81ff9ea0bd 100644 (file)
--- a/CRM/Batch/Page/Batch.php
+++ b/CRM/Batch/Page/Batch.php
@@ -39,42 +39,44 @@
 class CRM_Batch_Page_Batch 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
    */
-  public function &links() {}
+  public function &links() {
+  }
 
   /**
-   * 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_Batch_Form_Batch';
   }
 
   /**
-   * Get edit form name
+   * Get edit form name.
    *
-   * @return string name of this page.
+   * @return string
+   *   name of this page.
    */
   public function editName() {
     return ts('Batch Processing');
@@ -85,7 +87,8 @@ class CRM_Batch_Page_Batch extends CRM_Core_Page_Basic {
    *
    * @param null $mode
    *
-   * @return string user context.
+   * @return string
+   *   user context.
    */
   public function userContext($mode = NULL) {
     return CRM_Utils_System::currentPath();
@@ -103,8 +106,7 @@ class CRM_Batch_Page_Batch extends CRM_Core_Page_Basic {
   }
 
   public function search() {
-    if ($this->_action &
-      (CRM_Core_Action::ADD |
+    if ($this->_action & (CRM_Core_Action::ADD |
         CRM_Core_Action::UPDATE |
         CRM_Core_Action::DELETE
       )
@@ -118,4 +120,5 @@ class CRM_Batch_Page_Batch extends CRM_Core_Page_Basic {
     $form->process();
     $form->run();
   }
+
 }