Permalink
Browse files

fix PEAR5 usage BC break

  • Loading branch information...
1 parent 6ddfcbf commit 79d2b2cf602c89c250ff2f426a786b698a4b5610 @roojs roojs committed Apr 13, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 HTML/Template/Flexy/SmartyAPI.php
  2. +1 −1 HTML/Template/Flexy/compileAll.php
@@ -164,7 +164,7 @@ function display($templatename,$object=null,$elements=array())
if (class_exists('PEAR5',false)) {
$o = PEAR5::getStaticProperty('HTML_Template_Flexy','options');
}
- else {
+ if (empty($o)) {
$o = PEAR::getStaticProperty('HTML_Template_Flexy','options');
}
@@ -40,7 +40,7 @@
if (class_exists('PEAR5',false)) {
$options = &PEAR5::getStaticProperty('HTML_Template_Flexy','options');
}
-else {
+if (empty($options)) {
$options = &PEAR::getStaticProperty('HTML_Template_Flexy','options');
}
$options = $config['HTML_Template_Flexy'];

0 comments on commit 79d2b2c

Please sign in to comment.