Clean up user-defined registry entries.

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 4e47287..9b64343 100644 (file)
--- 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') &&