--- a/web/lib/Zend/Validate/Abstract.php Thu May 07 15:10:09 2015 +0200
+++ b/web/lib/Zend/Validate/Abstract.php Thu May 07 15:16:02 2015 +0200
@@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Abstract.php 25105 2012-11-07 20:33:22Z rob $
+ * @version $Id$
*/
/**
@@ -27,7 +27,7 @@
/**
* @category Zend
* @package Zend_Validate
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
abstract class Zend_Validate_Abstract implements Zend_Validate_Interface
@@ -229,6 +229,8 @@
} else {
$value = $value->__toString();
}
+ } elseif (is_array($value)) {
+ $value = $this->_implodeRecursive($value);
} else {
$value = implode((array) $value);
}
@@ -255,6 +257,26 @@
}
/**
+ * Joins elements of a multidimensional array
+ *
+ * @param array $pieces
+ * @return string
+ */
+ protected function _implodeRecursive(array $pieces)
+ {
+ $values = array();
+ foreach ($pieces as $item) {
+ if (is_array($item)) {
+ $values[] = $this->_implodeRecursive($item);
+ } else {
+ $values[] = $item;
+ }
+ }
+
+ return implode(', ', $values);
+ }
+
+ /**
* @param string $messageKey
* @param string $value OPTIONAL
* @return void
@@ -323,6 +345,7 @@
* Set translation object
*
* @param Zend_Translate|Zend_Translate_Adapter|null $translator
+ * @throws Zend_Validate_Exception
* @return Zend_Validate_Abstract
*/
public function setTranslator($translator = null)
@@ -370,7 +393,7 @@
* Set default translation object for all validate objects
*
* @param Zend_Translate|Zend_Translate_Adapter|null $translator
- * @return void
+ * @throws Zend_Validate_Exception
*/
public static function setDefaultTranslator($translator = null)
{