From: Matthew Wire (MJW Consulting) <mjw@mjwconsult.co.uk>
Date: Sun, 23 Jun 2019 18:06:24 +0000 (+0100)
Subject: Set logged in contact ID as default if one is not specified - this allows permission... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=81abab8ae10c5a022f5bf31229a743a826c0e9a0;p=civicrm-core.git

Set logged in contact ID as default if one is not specified - this allows permission checks etc. to work properly.
---

diff --git a/CRM/Core/Page/EntityPageTrait.php b/CRM/Core/Page/EntityPageTrait.php
index f5ff7867de..2d6b1228a9 100644
--- a/CRM/Core/Page/EntityPageTrait.php
+++ b/CRM/Core/Page/EntityPageTrait.php
@@ -145,7 +145,8 @@ trait CRM_Core_Page_EntityPageTrait {
     $this->assign('action', $this->getAction());
 
     $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this);
-    $this->setContactId(CRM_Utils_Request::retrieve('cid', 'Positive', $this, TRUE));
+    $this->setContactId(CRM_Utils_Request::retrieve('cid', 'Positive', $this, FALSE, CRM_Core_Session::getLoggedInContactID()));
+
     $this->assign('contactId', $this->getContactId());
 
     $this->_context = CRM_Utils_Request::retrieve('context', 'Alphanumeric', $this, FALSE, $this->getDefaultContext());