CRM-14106 - Regex targeting the first part of if statements

[civicrm-core.git] / CRM / Report / Form / Instance.php

diff --git a/CRM/Report/Form/Instance.php b/CRM/Report/Form/Instance.php
index 48a6dd92b744ba3cf0ec7b59394add4084336010..eefde6d64dc75009e81abeb3767e313afeaf85ca 100644 (file)
--- a/CRM/Report/Form/Instance.php
+++ b/CRM/Report/Form/Instance.php
@@ -211,24 +211,24 @@ class CRM_Report_Form_Instance {
       $defaults['report_header'] = CRM_Utils_Array::value('header', $defaults);
       $defaults['report_footer'] = CRM_Utils_Array::value('footer', $defaults);
 
-      if (CRM_Utils_Array::value('navigation_id', $defaults)) {
+      if (!empty($defaults['navigation_id'])) {
         //get the default navigation parent id
         $params = array('id' => $defaults['navigation_id']);
         CRM_Core_BAO_Navigation::retrieve($params, $navigationDefaults);
         $defaults['is_navigation'] = 1;
         $defaults['parent_id'] = CRM_Utils_Array::value('parent_id', $navigationDefaults);
 
-        if (CRM_Utils_Array::value('is_active', $navigationDefaults)) {
+        if (!empty($navigationDefaults['is_active'])) {
           $form->assign('is_navigation', TRUE);
         }
 
-        if (CRM_Utils_Array::value('id', $navigationDefaults)) {
+        if (!empty($navigationDefaults['id'])) {
           $form->_navigation['id'] = $navigationDefaults['id'];
           $form->_navigation['parent_id'] = $navigationDefaults['parent_id'];
         }
       }
 
-      if (CRM_Utils_Array::value('grouprole', $defaults)) {
+      if (!empty($defaults['grouprole'])) {
         foreach (explode(CRM_Core_DAO::VALUE_SEPARATOR, $defaults['grouprole']) as $value) {
           $grouproles[] = $value;
         }
@@ -251,7 +251,7 @@ class CRM_Report_Form_Instance {
       $instanceID = NULL; //unset $instanceID so a new copy would be created
     }
     $params['instance_id'] = $instanceID;
-    if (CRM_Utils_Array::value('is_navigation', $params)) {
+    if (!empty($params['is_navigation'])) {
       $params['navigation'] = $form->_navigation;
     }
     elseif ($instanceID){