Merge branch 'hotfix/3219' into develop

Close #3219
zendframework · Dec 13, 2012 · c4f5bc2 · c4f5bc2
2 parents 0a2f2c1 + 2b7cf66
commit c4f5bc2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/library/Zend/Form/Factory.php b/library/Zend/Form/Factory.php
@@ -16,7 +16,6 @@
 use Zend\InputFilter\InputFilterInterface;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Stdlib\Hydrator;
-use Zend\Stdlib\InitializableInterface;
 
 /**
  * @category   Zend
@@ -217,11 +216,6 @@ public function configureElement(ElementInterface $element, $spec)
             $element->setAttributes($attributes);
         }
 
-        // Hook to perform stuff, once all the configuration work has been done
-        if ($element instanceof InitializableInterface) {
-            $element->init();
-        }
-
         return $element;
     }
 

diff --git a/library/Zend/Form/FormElementManager.php b/library/Zend/Form/FormElementManager.php
@@ -12,6 +12,7 @@
 
 use Zend\ServiceManager\AbstractPluginManager;
 use Zend\ServiceManager\ConfigInterface;
+use Zend\Stdlib\InitializableInterface;
 
 /**
  * Plugin manager implementation for form elements.
@@ -102,6 +103,11 @@ public function injectFactory($element)
      */
     public function validatePlugin($plugin)
     {
+        // Hook to perform various initialization, when the element is not created through the factory
+        if ($plugin instanceof InitializableInterface) {
+            $plugin->init();
+        }
+
         if ($plugin instanceof ElementInterface) {
             return; // we're okay
         }