Sfoglia il codice sorgente

[TESTS] Fix failing Zend_View_Helper_Translate tests by having getTranslator() check registry if no translator present

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@19121 44c647ce-9c0f-0410-b52a-842ac1e357ba
matthew 16 anni fa
parent
commit
ab25c7ecd4
1 ha cambiato i file con 7 aggiunte e 7 eliminazioni
  1. 7 7
      library/Zend/View/Helper/Translate.php

+ 7 - 7
library/Zend/View/Helper/Translate.php

@@ -50,13 +50,6 @@ class Zend_View_Helper_Translate extends Zend_View_Helper_Abstract
      */
      */
     public function __construct($translate = null)
     public function __construct($translate = null)
     {
     {
-        if ($translate === null) {
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Translate')) {
-                $translate = Zend_Registry::get('Zend_Translate');
-            }
-        }
-
         if ($translate !== null) {
         if ($translate !== null) {
             $this->setTranslator($translate);
             $this->setTranslator($translate);
         }
         }
@@ -133,6 +126,13 @@ class Zend_View_Helper_Translate extends Zend_View_Helper_Abstract
      */
      */
     public function getTranslator()
     public function getTranslator()
     {
     {
+        if ($this->_translator === null) {
+            require_once 'Zend/Registry.php';
+            if (Zend_Registry::isRegistered('Zend_Translate')) {
+                $this->setTranslator(Zend_Registry::get('Zend_Translate'));
+            }
+        }
+
         return $this->_translator;
         return $this->_translator;
     }
     }