optimizations

diff --git a/framework/Block/lib/Horde/Block.php b/framework/Block/lib/Horde/Block.php
index 9124415..fd5bd94 100644 (file)
--- a/framework/Block/lib/Horde/Block.php
+++ b/framework/Block/lib/Horde/Block.php
@@ -106,7 +106,7 @@ class Horde_Block
 
         /* If we changed application context in the course of this
          * call, undo that change now. */
-        if ($app_pushed === true) {
+        if ($app_pushed) {
             $GLOBALS['registry']->popApp();
         }
 
@@ -136,7 +136,7 @@ class Horde_Block
 
         /* If we changed application context in the course of this
          * call, undo that change now. */
-        if ($app_pushed === true) {
+        if ($app_pushed) {
             $GLOBALS['registry']->popApp();
         }
 
@@ -166,7 +166,7 @@ class Horde_Block
 
         /* If we changed application context in the course of this
          * call, undo that change now. */
-        if ($app_pushed === true) {
+        if ($app_pushed) {
             $GLOBALS['registry']->popApp();
         }
 
@@ -190,7 +190,7 @@ class Horde_Block
 
         /* If we changed application context in the course of this
          * call, undo that change now. */
-        if ($app_pushed === true) {
+        if ($app_pushed) {
             $GLOBALS['registry']->popApp();
         }
     }

diff --git a/framework/Block/lib/Horde/Block/Collection.php b/framework/Block/lib/Horde/Block/Collection.php
index 6878e49..6c8ec17 100644 (file)
--- a/framework/Block/lib/Horde/Block/Collection.php
+++ b/framework/Block/lib/Horde/Block/Collection.php
@@ -113,6 +113,7 @@ class Horde_Block_Collection
                 }
                 closedir($dh);
             }
+
             // Don't pop an application if we didn't have to push one.
             if ($pushed) {
                 $GLOBALS['registry']->popApp($app);