Revert "made navigation viewhelper always inject it's data into plugins"

This reverts commit 56ff56c.
diodoe · Aug 30, 2012 · 6b073df · 6b073df
1 parent ec5ceea
commit 6b073df
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/library/Zend/View/Helper/Navigation.php b/library/Zend/View/Helper/Navigation.php
@@ -44,6 +44,13 @@ class Navigation extends AbstractNavigationHelper
      */
     protected $defaultProxy = 'menu';
 
+    /**
+     * Indicates whether or not a given helper has been injected
+     *
+     * @var array
+     */
+    protected $injected = array();
+
     /**
      * Whether container should be injected when proxying
      *
@@ -183,7 +190,11 @@ public function findHelper($proxy, $strict = true)
         $helper = $plugins->get($proxy);
         $class  = get_class($helper);
 
-        $this->inject($helper);
+        if (!isset($this->injected[$class])) {
+            $this->inject($helper);
+            $this->injected[$class] = true;
+        }
+
         return $helper;
     }
 
@@ -196,16 +207,20 @@ public function findHelper($proxy, $strict = true)
      */
     protected function inject(NavigationHelper $helper)
     {
-        if ($this->getInjectContainer()) {
+        if ($this->getInjectContainer() && !$helper->hasContainer()) {
             $helper->setContainer($this->getContainer());
         }
 
         if ($this->getInjectAcl()) {
-            $helper->setAcl($this->getAcl());
-            $helper->setRole($this->getRole());
+            if (!$helper->hasAcl()) {
+                $helper->setAcl($this->getAcl());
+            }
+            if (!$helper->hasRole()) {
+                $helper->setRole($this->getRole());
+            }
         }
 
-        if ($this->getInjectTranslator()) {
+        if ($this->getInjectTranslator() && !$helper->hasTranslator()) {
             $helper->setTranslator(
                 $this->getTranslator(), $this->getTranslatorTextDomain()
             );