From c55582dbd8edb01c6afaae2b42fae457a5c55b7b Mon Sep 17 00:00:00 2001 From: kevin_fourie Date: Tue, 24 Apr 2007 14:49:32 +0000 Subject: [PATCH] KTS-1911 "CLONE -Call to a member function on a non-object in /opt/ktdms/knowledgeTree/plugins/ktcore/admin/conditions.php on line 124 (SUP-204)" Added better null object handling. However, the root of this error lies in an upgrade database issue I think. We need to sort out the database constrints on upgrade! --- plugins/ktcore/admin/conditions.php | 5 ++++- search/booleanSearch.php | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/ktcore/admin/conditions.php b/plugins/ktcore/admin/conditions.php index 39ab4bf..e7e55dc 100755 --- a/plugins/ktcore/admin/conditions.php +++ b/plugins/ktcore/admin/conditions.php @@ -119,7 +119,10 @@ class KTConditionDispatcher extends KTAdminDispatcher { if(count($aSubgroup['values'])) { foreach ($aSubgroup['values'] as $iv => $t) { $datavars =& $aSubgroup['values'][$iv]; - $oCriterion = $oCriteriaRegistry->getCriterion($datavars['type']); + $oCriterion = $oCriteriaRegistry->getCriterion($datavars['type']); + if($oCriterion == null || $oCriterion == "" || PEAR:isError($oCriterion)) { + $this->errorRedirectToMain('Criterion error'); + } $datavars['typename'] = $oCriterion->sDisplay; $datavars['widgetval'] = $oCriterion->searchWidget(null, $datavars['data']); } diff --git a/search/booleanSearch.php b/search/booleanSearch.php index a483024..0f77442 100755 --- a/search/booleanSearch.php +++ b/search/booleanSearch.php @@ -276,6 +276,9 @@ class BooleanSearchDispatcher extends KTStandardDispatcher { if(!empty($subgroup['values'])) { foreach($subgroup['values'] as $value) { $oCriterion =& $oCriteriaRegistry->getCriterion($value['type']); + if($oCriterion == null || $oCriterion == "" || PEAR:isError($oCriterion)) { + $this->errorRedirectToMain('Criterion error'); + } $aGroup[] = $oCriterion->parameterDisplay($value['data']); } } -- libgit2 0.21.4