Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-01-14-40-22

[civicrm-core.git] / CRM / Contribute / Page / ContributionPage.php

diff --git a/CRM/Contribute/Page/ContributionPage.php b/CRM/Contribute/Page/ContributionPage.php
index ad21d501bf40f9d614a862ef2fbac14d0787305f..c958e280b70a3c5963389e596383e8c432b9b24b 100644 (file)
--- a/CRM/Contribute/Page/ContributionPage.php
+++ b/CRM/Contribute/Page/ContributionPage.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$
  *
  */
@@ -228,10 +228,9 @@ class CRM_Contribute_Page_ContributionPage extends CRM_Core_Page {
     if (!isset(self::$_contributionLinks)) {
       //get contribution dates.
       $dates = CRM_Contribute_BAO_Contribution::getContributionDates();
-      foreach (array(
-        'now', 'yearDate', 'monthDate') as $date) {
-        $$date = $dates[$date];
-      }
+      $now = $dates['now'];
+      $yearDate = $dates['yearDate'];
+      $monthDate = $dates['monthDate'];
       $yearNow = $yearDate + 10000;
 
       $urlString = 'civicrm/contribute/search';
@@ -387,6 +386,8 @@ AND         cp.page_type = 'contribute'
   /**
    * Browse all contribution pages
    *
+   * @param null $action
+   *
    * @return void
    * @access public
    * @static
@@ -553,6 +554,12 @@ ORDER BY title asc
     $form->run();
   }
 
+  /**
+   * @param array $params
+   * @param bool $sortBy
+   *
+   * @return int|string
+   */
   function whereClause(&$params, $sortBy = TRUE) {
     $values    = $clauses = array();
     $title     = $this->get('title');
@@ -613,6 +620,10 @@ ORDER BY title asc
     return implode(' AND ', $clauses);
   }
 
+  /**
+   * @param $whereClause
+   * @param $whereParams
+   */
   function pager($whereClause, $whereParams) {
 
     $params['status'] = ts('Contribution %%StatusMessage%%');
@@ -635,6 +646,10 @@ SELECT count(id)
     $this->assign_by_ref('pager', $this->_pager);
   }
 
+  /**
+   * @param $whereClause
+   * @param $whereParams
+   */
   function pagerAtoZ($whereClause, $whereParams) {
 
     $query = "
@@ -649,6 +664,11 @@ SELECT count(id)
     $this->assign('aToZ', $aToZBar);
   }
 
+  /**
+   * @param $sectionsInfo
+   *
+   * @return array
+   */
   function formatConfigureLinks($sectionsInfo) {
     //build the formatted configure links.
     $formattedConfLinks = self::configureActionLinks();