Commit 70c14e91 by Seldaek

* Fixed file template class reading from the string compiler factory - thanks to…

* Fixed file template class reading from the string compiler factory - thanks to MrOxiMoron for the patch git-svn-id: svn://dwoo.org/dwoo/trunk@184 0598d79b-80c4-4d41-97ba-ac86fbbd088b
parent d3c7dbd7
[2008--] 1.0.0
* Plugins: improved the dump plugin, it now displays object's properties
and optionally public methods (if the new show_methods arg is set to true)
(thanks to Stephan Wentz for the patch)
- thanks to Stephan Wentz for the patch
* Lines containing only comments and whitespace are now entirely removed
* Adapters: Zend: Added parameters to provide a custom engine (extends Dwoo)
or a custom data class (extends Dwoo_Data) - thanks to Maxime Mérian for
the patch
* Fixed file template class reading from the string compiler factory - thanks
to MrOxiMoron for the patch
* Fixed a 1.0.0beta regression that messed with custom plugin directories
on Windows
......
......@@ -125,7 +125,7 @@ class Dwoo_Template_File extends Dwoo_Template_String
$this->compilationEnforced = false;
if ($compiler === null) {
$compiler = $dwoo->getDefaultCompilerFactory('string');
$compiler = $dwoo->getDefaultCompilerFactory($this->getResourceName());
if ($compiler === null || $compiler === array('Dwoo_Compiler', 'compilerFactory')) {
if (class_exists('Dwoo_Compiler', false) === false) {
......
......@@ -354,7 +354,7 @@ class Dwoo_Template_String implements Dwoo_ITemplate
$this->compilationEnforced = false;
if ($compiler === null) {
$compiler = $dwoo->getDefaultCompilerFactory('string');
$compiler = $dwoo->getDefaultCompilerFactory($this->getResourceName());
if ($compiler === null || $compiler === array('Dwoo_Compiler', 'compilerFactory')) {
if (class_exists('Dwoo_Compiler', false) === false) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment