From f4bff68a89ca3c2907fd2bf48247ef6640e65b9e Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 26 Jun 2013 11:09:19 -0700
Subject: [PATCH] Code cleanup

---
 CRM/Contact/BAO/Query.php            |  5 ++---
 CRM/Contact/Form/Search/Advanced.php |  3 ++-
 CRM/Core/Selector/Controller.php     | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index 9db32208ff..c7401cab2a 100644
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -1231,13 +1231,12 @@ class CRM_Contact_BAO_Query {
       $this->filterRelatedContacts($from, $where, $having);
     }
 
-    // CRM_Core_Error::debug($this);
     return array($select, $from, $where, $having);
   }
 
   function &getWhereValues($name, $grouping) {
     $result = NULL;
-    foreach ($this->_params as $id => $values) {
+    foreach ($this->_params as $values) {
       if ($values[0] == $name && $values[3] == $grouping) {
         return $values;
       }
@@ -4054,7 +4053,7 @@ civicrm_relationship.start_date > {$today}
 
     $onlyDeleted = in_array(array('deleted_contacts', '=', '1', '0', '0'), $this->_params);
 
-    // if we’re explicitely looking for a certain contact’s contribs, events, etc.
+    // if we’re explicitly looking for a certain contact’s contribs, events, etc.
     // and that contact happens to be deleted, set $onlyDeleted to true
     foreach ($this->_params as $values) {
       $name = CRM_Utils_Array::value(0, $values);
diff --git a/CRM/Contact/Form/Search/Advanced.php b/CRM/Contact/Form/Search/Advanced.php
index 6ad1e97d0c..ea792c36c4 100644
--- a/CRM/Contact/Form/Search/Advanced.php
+++ b/CRM/Contact/Form/Search/Advanced.php
@@ -376,7 +376,8 @@ class CRM_Contact_Form_Search_Advanced extends CRM_Contact_Form_Search {
   /**
    * normalize default values for multiselect plugins
    *
-   * @return void
+   * @param $defaults array
+   * @return array
    * @access private
    */
   function normalizeDefaultValues(&$defaults) {
diff --git a/CRM/Core/Selector/Controller.php b/CRM/Core/Selector/Controller.php
index 98c69decf7..f84b18626c 100644
--- a/CRM/Core/Selector/Controller.php
+++ b/CRM/Core/Selector/Controller.php
@@ -222,9 +222,9 @@ class CRM_Core_Selector_Controller {
     $this->_sort = new CRM_Utils_Sort($this->_sortOrder, $this->_sortID);
 
     /*
-         * if we are in transfer mode, do not goto database, use the
-         * session values instead
-         */
+     * if we are in transfer mode, do not goto database, use the
+     * session values instead
+     */
 
     if ($output == self::TRANSFER) {
       $params['total'] = $this->_store->get($this->_prefix . 'rowCount');
@@ -237,8 +237,8 @@ class CRM_Core_Selector_Controller {
     $this->_object->getPagerParams($action, $params);
 
     /*
-         * Set the default values of RowsPerPage
-         */
+     * Set the default values of RowsPerPage
+     */
 
     $storeRowCount = $store->get($this->_prefix . CRM_Utils_Pager::PAGE_ROWCOUNT);
     if ($storeRowCount) {
-- 
2.25.1