Merge branch 'master' of /~https://github.com/shevron/zf2 into hotfix/p…

…r-471
zendframework · Oct 6, 2011 · b5ac7be · b5ac7be
11 parents 939931d + 04e8117 + 8c6fd94 + 5f97d10 + 5dea065 + ba9fe40 + b315009 + c7b1a95 + 005e38c + a6d0d29 + fa3103f
commit b5ac7be
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/AbstractValidator.php b/src/AbstractValidator.php
@@ -327,12 +327,12 @@ public function getObscureValue()
     /**
      * Set translation object
      *
-     * @param  Zend_Translator|\Zend\Translator\Adapter\Adapter|null $translator
+     * @param  Zend_Translator|\Zend\Translator\Adapter\AbstractAdapter|null $translator
      * @return \Zend\Validator\AbstractValidator
      */
     public function setTranslator($translator = null)
     {
-        if ((null === $translator) || ($translator instanceof Translator\Adapter)) {
+        if ((null === $translator) || ($translator instanceof Translator\Adapter\AbstractAdapter)) {
             $this->_translator = $translator;
         } elseif ($translator instanceof Translator\Translator) {
             $this->_translator = $translator->getAdapter();
@@ -378,7 +378,7 @@ public function hasTranslator()
      */
     public static function setDefaultTranslator($translator = null)
     {
-        if ((null === $translator) || ($translator instanceof Translator\Adapter)) {
+        if ((null === $translator) || ($translator instanceof Translator\Adapter\AbstractAdapter)) {
             self::$_defaultTranslator = $translator;
         } elseif ($translator instanceof Translator\Translator) {
             self::$_defaultTranslator = $translator->getAdapter();
@@ -397,7 +397,7 @@ public static function getDefaultTranslator()
         if (null === self::$_defaultTranslator) {
             if (\Zend\Registry::isRegistered('Zend_Translator')) {
                 $translator = \Zend\Registry::get('Zend_Translator');
-                if ($translator instanceof Translator\Adapter) {
+                if ($translator instanceof Translator\Adapter\AbstractAdapter) {
                     return $translator;
                 } elseif ($translator instanceof Translator\Translator) {
                     return $translator->getAdapter();