Author: bicou Date: 2010-03-27 17:04:00 +0100 (Sat, 27 Mar 2010) New Revision: 28829
Modified: plugins/sfRedisPlugin/trunk/config/sfRedisPluginConfiguration.class.php Log: [sfRedisPlugin] use sfProjectconfiguration::getConfigPaths in plugin initialization Modified: plugins/sfRedisPlugin/trunk/config/sfRedisPluginConfiguration.class.php =================================================================== --- plugins/sfRedisPlugin/trunk/config/sfRedisPluginConfiguration.class.php 2010-03-27 16:01:49 UTC (rev 28828) +++ plugins/sfRedisPlugin/trunk/config/sfRedisPluginConfiguration.class.php 2010-03-27 16:04:00 UTC (rev 28829) @@ -1,16 +1,19 @@ <?php /** - * sfRedisPluginConfiguration + * sfRedisPlugin configuration. * - * @uses sfPluginConfiguration - * @package sfRedisPlugin - * @author Benjamin VIELLARD <[email protected]> - * @license The MIT License - * @version SVN: $Id$ + * @package sfRedisPlugin + * @subpackage config + * @uses sfPluginConfiguration + * @author Benjamin VIELLARD <[email protected]> + * @license The MIT License + * @version SVN: $Id$ */ class sfRedisPluginConfiguration extends sfPluginConfiguration { + const VERSION = '1.0.0-DEV'; + /** * path to config * @@ -26,25 +29,16 @@ */ public function initialize() { - try + if ($this->configuration instanceof sfApplicationConfiguration) { - if ($this->configuration instanceof sfApplicationConfiguration) - { - $configCache = $this->configuration->getConfigCache(); - $configCache->registerConfigHandler(self::CONFIG_PATH, 'sfRedisConfigHandler'); - $config = include $configCache->checkConfig(self::CONFIG_PATH); - } - else - { - $config = sfRedisConfigHandler::getConfiguration(array( - $this->getRootDir().'/'.self::CONFIG_PATH, - $this->configuration->getRootDir().'/'.self::CONFIG_PATH - )); - } + $configCache = $this->configuration->getConfigCache(); + $configCache->registerConfigHandler(self::CONFIG_PATH, 'sfRedisConfigHandler'); + $config = include $configCache->checkConfig(self::CONFIG_PATH); } - catch (sfConfigurationException $e) + else { - $config = null; + $configPaths = $this->configuration->getConfigPaths(self::CONFIG_PATH); + $config = sfRedisConfigHandler::getConfiguration($configPaths); } sfRedis::initialize($config); -- You received this message because you are subscribed to the Google Groups "symfony SVN" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/symfony-svn?hl=en.
