From 816ff0129f7d1c0b397c104cfe3b175b4fd4c6db Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 17 Mar 2011 12:29:21 +0100 Subject: [PATCH] typo in new classloader improvements --- etc/volkszaehler.conf.template.php | 2 +- htdocs/backend.php | 2 +- misc/tools/doctrine.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/volkszaehler.conf.template.php b/etc/volkszaehler.conf.template.php index 589f174..15810fb 100644 --- a/etc/volkszaehler.conf.template.php +++ b/etc/volkszaehler.conf.template.php @@ -75,7 +75,7 @@ $config['db']['dbname'] = 'volkszaehler'; * @var string path of Doctrine library * @link http://www.php.net/manual/en/ini.core.php#ini.include-path */ -$config['lib']['doctrine'] = VZ_DIR . '/lib/vendor/Doctrine'; +$config['lib']['doctrine'] = VZ_DIR . '/lib/vendor/Doctrine'; /** @var boolean disables some optimizations. Only use it when you exactly know what you are doing. */ $config['devmode'] = FALSE; diff --git a/htdocs/backend.php b/htdocs/backend.php index 1eaa4a8..9d599d8 100644 --- a/htdocs/backend.php +++ b/htdocs/backend.php @@ -43,7 +43,7 @@ require_once VZ_DIR . '/lib/Util/Configuration.php'; Util\Configuration::load(VZ_DIR . '/etc/volkszaehler.conf'); $classLoaders = array( - new Util\ClassLoader('Doctrine', (is_null(Util\Configuration::read('lib.doctrine')) ? 'Doctrine' : Util\Configuration::read('lib.doctrine')), + new Util\ClassLoader('Doctrine', (is_null(Util\Configuration::read('lib.doctrine'))) ? 'Doctrine' : Util\Configuration::read('lib.doctrine')), new Util\ClassLoader('Volkszaehler', VZ_DIR . '/lib') ); diff --git a/misc/tools/doctrine.php b/misc/tools/doctrine.php index 483dd5f..dc4418e 100644 --- a/misc/tools/doctrine.php +++ b/misc/tools/doctrine.php @@ -36,7 +36,7 @@ require_once VZ_DIR . '/lib/Util/Configuration.php'; Util\Configuration::load(VZ_DIR . '/etc/volkszaehler.conf'); $classLoaders = array( - new Util\ClassLoader('Doctrine', Util\Configuration::read('lib.doctrine')), + new Util\ClassLoader('Doctrine', (is_null(Util\Configuration::read('lib.doctrine'))) ? 'Doctrine' : Util\Configuration::read('lib.doctrine')), new Util\ClassLoader('Symfony', VZ_DIR . '/lib/vendor/Doctrine/Symfony'), new Util\ClassLoader('Volkszaehler', VZ_DIR . '/lib') );