From c16390f8e7a1d232909434c779f5b5a836b63f2d Mon Sep 17 00:00:00 2001
From: Paul Barmaksezian <paulbarmaksezian@forwardedge.org>
Date: Sat, 13 Aug 2022 16:17:41 -0700
Subject: [PATCH] PHP fatal error fixes, issue #848

---
 CRM/Civicase/BAO/Query/ContactLock.php | 4 ++--
 CRM/Civicase/Page/MyActivities.php     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CRM/Civicase/BAO/Query/ContactLock.php b/CRM/Civicase/BAO/Query/ContactLock.php
index 19097a9b6..bfd3c7795 100644
--- a/CRM/Civicase/BAO/Query/ContactLock.php
+++ b/CRM/Civicase/BAO/Query/ContactLock.php
@@ -18,7 +18,7 @@ public function &getFields() {
   /**
    * Alters from statement to include case locks.
    */
-  public function from($fieldName, $mode, $side) {
+  public static function from($fieldName, $mode, $side) {
     if ($fieldName == 'civicase_contactlock') {
       $loggedContactID = CRM_Core_Session::singleton()->getLoggedInContactID();
 
@@ -38,7 +38,7 @@ public function from($fieldName, $mode, $side) {
   /**
    * Alters where statement to include case locks.
    */
-  public function where(&$query) {
+  public static function where(&$query) {
     if ($query->_mode == CRM_Contact_BAO_QUERY::MODE_ACTIVITY) {
 
       $query->_where[0][] = CRM_Contact_BAO_Query::buildClause("activity_lock", 'IS NULL');
diff --git a/CRM/Civicase/Page/MyActivities.php b/CRM/Civicase/Page/MyActivities.php
index 2bfd9df24..addbc1935 100644
--- a/CRM/Civicase/Page/MyActivities.php
+++ b/CRM/Civicase/Page/MyActivities.php
@@ -20,7 +20,7 @@ class CRM_Civicase_Page_MyActivities extends CRM_Core_Page {
   public function run() {
     $loader = new AngularLoader();
     $loader->setPageName('civicrm/case/my-activities');
-    $loader->setModules(['crmApp', 'my-activities']);
+    $loader->addModules(['crmApp', 'my-activities']);
     $loader->load();
 
     CRM_Core_Resources::singleton()