add unit test, fix jenkin warning and remove unused array variable

[civicrm-core.git] / CRM / Core / BAO / Dashboard.php

diff --git a/CRM/Core/BAO/Dashboard.php b/CRM/Core/BAO/Dashboard.php
index 84b15097184836dc7f242fe9b29a6d87f86ea985..7fbfa07c70f45d0b9ddb1aabcef232042a41a628 100644 (file)
--- a/CRM/Core/BAO/Dashboard.php
+++ b/CRM/Core/BAO/Dashboard.php
@@ -439,8 +439,7 @@ class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard {
     }
     else {
       //Get the id of Logged in User
-      $session = CRM_Core_Session::singleton();
-      $contactID = $session->get('userID');
+      $contactID = CRM_Core_Session::getLoggedInContactID();
       if (!empty($contactID)) {
         $contactIDs[$contactID] = NULL;
       }
@@ -451,9 +450,8 @@ class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard {
     $query = "SELECT distinct( contact_id )
               FROM civicrm_dashboard_contact WHERE dashboard_id = {$dashlet->id}";
     $dao = CRM_Core_DAO::executeQuery($query);
-    $skipContactIDs = array();
     while ($dao->fetch()) {
-      if(array_key_exists($dao->contact_id, $contactIDs)) {
+      if (array_key_exists($dao->contact_id, $contactIDs)) {
         unset($contactIDs[$dao->contact_id]);
       }
     }