From ed6f463144b70b05304ab4f0c9d19705c6a57e62 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 1 Sep 2010 02:14:54 -0600 Subject: [PATCH] type is no longer a parameter; this file is autoloaded by the class_exists() call --- framework/Block/lib/Horde/Block/Collection.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/framework/Block/lib/Horde/Block/Collection.php b/framework/Block/lib/Horde/Block/Collection.php index 604f0a1ed..75fc4c28b 100644 --- a/framework/Block/lib/Horde/Block/Collection.php +++ b/framework/Block/lib/Horde/Block/Collection.php @@ -44,7 +44,7 @@ class Horde_Block_Collection * * @return Horde_Block_Collection The Horde_Block_Collection instance. */ - static public function singleton($type = null, $apps = array()) + static public function singleton($apps = array()) { sort($apps); $signature = hash('md5', serialize($apps)); @@ -134,11 +134,6 @@ class Horde_Block_Collection throw new Horde_Exception(sprintf('%s is not activated.', $GLOBALS['registry']->get('name', $app))); } - $path = $registry->get('fileroot', $app) . '/lib/Block/' . $name . '.php'; - if (is_readable($path)) { - include_once $path; - } - $class = 'Horde_Block_' . $app . '_' . $name; if (!class_exists($class)) { throw new Horde_Exception(sprintf('%s not found.', $class)); -- 2.11.0