diff options
| author | Christian Stocker <chregu@php.net> | 2001-07-06 10:24:12 +0000 |
|---|---|---|
| committer | Christian Stocker <chregu@php.net> | 2001-07-06 10:24:12 +0000 |
| commit | f74079c8ccb5345597382bc6fdb5817d925879c5 (patch) | |
| tree | 9c05cbcc7dca927ed9654f7ae7587a4f58b1b8b6 | |
| parent | fb30f1b0676f04be9412ddac59b0d16e8a6556ec (diff) | |
| download | php-git-f74079c8ccb5345597382bc6fdb5817d925879c5.tar.gz | |
Patch by Tobias, so parseInput returns pearError
| -rw-r--r-- | pear/Config.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pear/Config.php b/pear/Config.php index 64d5bb9292..cd621e32ac 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; } |
