From f74079c8ccb5345597382bc6fdb5817d925879c5 Mon Sep 17 00:00:00 2001 From: Christian Stocker Date: Fri, 6 Jul 2001 10:24:12 +0000 Subject: [PATCH] Patch by Tobias, so parseInput returns pearError --- pear/Config.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pear/Config.php b/pear/Config.php index 64d5bb92921..cd621e32aca 100644 --- a/pear/Config.php +++ b/pear/Config.php @@ -244,7 +244,9 @@ class Config { $totaldata = array(); foreach ($files as $datasrc) { - $this->container->parseInput($datasrc,$feature); + if (Pear::isError($error = $this->container->parseInput($datasrc,$feature))) + return $error; + $totaldata = $this->array_merge_clobber($totaldata,$this->container->data); unset ($this->data); $this->datasrc = $datasrc; @@ -253,7 +255,9 @@ class Config { } else { - $this->container->parseInput($files,$feature); + if (Pear::isError($error = $this->container->parseInput($files,$feature))) + return $error; + $this->data = $this->container->data; $this->datasrc = $files; }