Merge pull request #541 from tmannell/7.x-master

PHP 7.1 incompatibility error fix for -> Error: Using $this when not in object context in civicrm_form_data()
civicrm · Jan 7, 2019 · 5be627f · 5be627f
2 parents 25976fc + 19863d9
commit 5be627f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/civicrm.module b/civicrm.module
@@ -584,10 +584,10 @@ function civicrm_form_data($edit, &$user, $category, $reset, $doNotProcess = FAL
     // do not allow edit for anon users in joomla frontend, CRM-4668, unless u have checksum CRM-5228
     $config = CRM_Core_Config::singleton();
     if ($config->userFrameworkFrontend) {
-      CRM_Contact_BAO_Contact_Permission::validateOnlyChecksum($userID, $this);
+      CRM_Contact_BAO_Contact_Permission::validateOnlyChecksum($userID, $edit);
     }
     else {
-      CRM_Contact_BAO_Contact_Permission::validateChecksumContact($userID, $this);
+      CRM_Contact_BAO_Contact_Permission::validateChecksumContact($userID, $edit);
     }
   }
   $ctype = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $userID, 'contact_type');