Remove legacy calls to civicrm_error, unpack return

[civicrm-core.git] / CRM / Contact / Selector.php

diff --git a/CRM/Contact/Selector.php b/CRM/Contact/Selector.php
index 17a1155d0fdb481ef48bb28bec1bf7c0718623b7..872004d4757ee9d2bd5f69332dbcb6627114fc13 100644 (file)
--- a/CRM/Contact/Selector.php
+++ b/CRM/Contact/Selector.php
@@ -324,7 +324,7 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
   public function getPagerParams($action, &$params) {
     $params['status'] = ts('Contact %%StatusMessage%%');
     $params['csvString'] = NULL;
-    $params['rowCount'] = CRM_Utils_Pager::ROWCOUNT;
+    $params['rowCount'] = Civi::settings()->get('default_pager_size');
 
     $params['buttonTop'] = 'PagerTopButton';
     $params['buttonBottom'] = 'PagerBottomButton';
@@ -833,9 +833,14 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
         // allow components to add more actions
         CRM_Core_Component::searchAction($row, $result->contact_id);
 
+        $contactUrl = CRM_Utils_System::url('civicrm/contact/view',
+          "reset=1&cid={$result->contact_id}&key={$this->_key}&context={$this->_context}"
+        );
         $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? $result->contact_sub_type : $result->contact_type,
           FALSE,
-          $result->contact_id
+          $result->contact_id,
+          TRUE,
+          $contactUrl
         );
 
         $row['contact_type_orig'] = $result->contact_sub_type ? $result->contact_sub_type : $result->contact_type;
@@ -990,8 +995,15 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
       CRM_Core_Component::searchAction($row, $row['contact_id']);
 
       if (!empty($row['contact_type_orig'])) {
+        $contactUrl = CRM_Utils_System::url('civicrm/contact/view',
+          "reset=1&cid={$row['contact_id']}&key={$this->_key}&context={$this->_context}"
+        );
         $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($row['contact_type_orig'],
-          FALSE, $row['contact_id']);
+          FALSE,
+          $row['contact_id'],
+          TRUE,
+          $contactUrl
+        );
       }
     }
   }