Skip to content

Commit 50d794c

Browse files
committed
Use the official Smarty API way of adding a plugins directory.
Use an array as the default value so that (a) we don't point at directories that don't exist and (b) we hint to the client programmer that more than one directory can be added. This way you can add more than one plugins dir, too, giving you more flexibility.
1 parent 5c92fd1 commit 50d794c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

classes/view/smarty.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ public static function parser()
5959
static::$_parser->compile_dir = \Config::get('parser.View_Smarty.environment.compile_dir', APPPATH.'tmp'.DS.'Smarty'.DS.'templates_c'.DS);
6060
static::$_parser->config_dir = \Config::get('parser.View_Smarty.environment.config_dir', APPPATH.'tmp'.DS.'Smarty'.DS.'configs'.DS);
6161
static::$_parser->cache_dir = \Config::get('parser.View_Smarty.environment.cache_dir', APPPATH.'cache'.DS.'Smarty'.DS);
62-
static::$_parser->plugins_dir = array_merge(static::$_parser->plugins_dir, array(\Config::get('parser.View_Smarty.environment.plugins_dir', APPPATH.'smarty'.DS)));
62+
$plugins_dir = \Config::get('parser.View_Smarty.environment.plugins_dir', array());
63+
static::$_parser->addPluginsDir($plugins_dir);
6364

6465
static::$_parser->caching = \Config::get('parser.View_Smarty.environment.caching', false);
6566
static::$_parser->cache_lifetime = \Config::get('parser.View_Smarty.environment.cache_lifetime', 0);

config/parser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
'compile_dir' => APPPATH.'tmp'.DS.'Smarty'.DS.'templates_c'.DS,
139139
'config_dir' => APPPATH.'tmp'.DS.'Smarty'.DS.'configs'.DS,
140140
'cache_dir' => APPPATH.'cache'.DS.'Smarty'.DS,
141-
'plugins_dir' => APPPATH.'smarty'.DS,
141+
'plugins_dir' => array(),
142142
'caching' => false,
143143
'cache_lifetime' => 0,
144144
'force_compile' => false,

0 commit comments

Comments
 (0)