Merge pull request #11135 from GinkgoFJG/CRM-21300-joomla-perms-notices

CRM-21300: Addressed notices due to unexpected NULL from Joomla DB object.
civicrm · Oct 17, 2017 · 8ca9fa9 · 8ca9fa9
2 parents ab5e6a6 + 76d556c
commit 8ca9fa9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/CRM/Core/Permission/Joomla.php b/CRM/Core/Permission/Joomla.php
@@ -181,8 +181,9 @@ private function getUserGroupPermsAssociations() {
 
     $db->setQuery($query);
 
-    // Load the result as a stdClass object, decoding JSON on the way
-    return json_decode($db->loadObject()->rules);
+    // Joomla gotcha: loadObject returns NULL in the case of no matches.
+    $result = $db->loadObject();
+    return $result ? json_decode($result->rules) : (object) array();
   }
 
   /**