projects
/
horde.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
13ad61e
)
revert - we want exceptions to go beyond this point (though at some point we might...
author
Chuck Hagenbuch
<chuck@horde.org>
Sun, 12 Jul 2009 02:17:08 +0000
(22:17 -0400)
committer
Chuck Hagenbuch
<chuck@horde.org>
Sun, 12 Jul 2009 02:17:17 +0000
(22:17 -0400)
framework/Core/lib/Horde/Registry.php
patch
|
blob
|
history
diff --git
a/framework/Core/lib/Horde/Registry.php
b/framework/Core/lib/Horde/Registry.php
index
42dc33f
..
29695cd
100644
(file)
--- a/
framework/Core/lib/Horde/Registry.php
+++ b/
framework/Core/lib/Horde/Registry.php
@@
-899,12
+899,7
@@
class Horde_Registry
public function importConfig($app)
{
if (($app != 'horde') && !$this->_loadCacheVar('conf-' . $app)) {
- try {
- $appConfig = Horde::loadConfiguration('conf.php', 'conf', $app);
- } catch (Horde_Exception $e) {
- $appConfig = array();
- }
-
+ $appConfig = Horde::loadConfiguration('conf.php', 'conf', $app);
$this->_cache['conf-' . $app] = Horde_Array::array_merge_recursive_overwrite($this->_cache['conf-horde'], $appConfig);
$this->_saveCacheVar('conf-' . $app);
}