From f0c7117e042da4a45dcb240b66ee57d260a3459f Mon Sep 17 00:00:00 2001 From: Arthur Portugal Date: Thu, 4 Feb 2010 18:58:26 -0500 Subject: [PATCH] Added a validation to the function create list CT#191 --- main/inc/lib/surveymanager.lib.php | 45 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/main/inc/lib/surveymanager.lib.php b/main/inc/lib/surveymanager.lib.php index 4fbb3c2456..587829f9e7 100755 --- a/main/inc/lib/surveymanager.lib.php +++ b/main/inc/lib/surveymanager.lib.php @@ -628,33 +628,34 @@ class SurveyTree { */ public function createList ($list) { $result=array(); - foreach ($list as $key=>$node) - { - if (is_array($node['children'])) - { - //echo $key; echo '--
'; - //print_r($node); - //echo '
'; - $result[$key]= $node['name']; - $re=self::createList($node['children']); - if (!empty($re)) + if(is_array($list)) { + foreach ($list as $key=>$node) { + if (is_array($node['children'])) { - if (is_array($re)) - foreach ($re as $key=>$r) + //echo $key; echo '--
'; + //print_r($node); + //echo '
'; + $result[$key]= $node['name']; + $re=self::createList($node['children']); + if (!empty($re)) + { + if (is_array($re)) + foreach ($re as $key=>$r) + { + $result[$key]=''.$r; + } + else { - $result[$key]=''.$r; + $result[]=$re; } - else - { - $result[]=$re; + } - } - } - else - { - //echo $key; echo '-
'; - $result[$key]=$node['name']; + else + { + //echo $key; echo '-
'; + $result[$key]=$node['name']; + } } } return $result;