From 4e91cafd3d4ae9fd1d85dbc7201da785545cd558 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 2 Feb 2010 23:35:17 -0700 Subject: [PATCH] Clean up user-defined registry entries. --- framework/Core/lib/Horde/Registry.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php index 4e4728709..9b6434360 100644 --- a/framework/Core/lib/Horde/Registry.php +++ b/framework/Core/lib/Horde/Registry.php @@ -393,11 +393,17 @@ class Horde_Registry continue; } - if (isset($app['fileroot']) && - (!file_exists($app['fileroot']) || - (file_exists($app['fileroot'] . '/config/conf.xml') && - !file_exists($app['fileroot'] . '/config/conf.php')))) { - $app['status'] = 'inactive'; + if (isset($app['fileroot'])) { + $app['fileroot'] = rtrim($app['fileroot'], ' /'); + if (!file_exists($app['fileroot']) || + (file_exists($app['fileroot'] . '/config/conf.xml') && + !file_exists($app['fileroot'] . '/config/conf.php'))) { + $app['status'] = 'inactive'; + } + } + + if (isset($app['webroot'])) { + $app['webroot'] = rtrim($app['webroot'], ' /'); } if (($app['status'] != 'inactive') && -- 2.11.0