Only pop from application stack if we successfully pushed.

Fixed weird side-effects like loading hooks.php twice if reloading the topbar on Horde base pages.
horde · Aug 5, 2016 · 3ddc937 · 3ddc937
1 parent 413cd0c
commit 3ddc937
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/horde/lib/Ajax/Application/Handler.php b/horde/lib/Ajax/Application/Handler.php
@@ -31,12 +31,14 @@ public function topbarUpdate()
     {
         global $injector, $registry;
 
-        $registry->pushApp($this->vars->app);
+        $pushed = $registry->pushApp($this->vars->app);
         $topbar = $injector->getInstance('Horde_Core_Factory_Topbar')
             ->create('Horde_Tree_Renderer_Menu', array('nosession' => true));
         $hash = $topbar->getHash();
         $tree = $topbar->getTree();
-        $registry->popApp();
+        if ($pushed) {
+            $registry->popApp();
+        }
 
         if ($this->vars->hash == $hash) {
             return false;