--- a/web/lib/Zend/Form/Element.php Thu May 07 15:10:09 2015 +0200
+++ b/web/lib/Zend/Form/Element.php Thu May 07 15:16:02 2015 +0200
@@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Form
- * @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
*/
@@ -36,9 +36,9 @@
* @category Zend
* @package Zend_Form
* @subpackage Element
- * @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: Element.php 25173 2012-12-22 20:05:32Z rob $
+ * @version $Id$
*/
class Zend_Form_Element implements Zend_Validate_Interface
{
@@ -227,6 +227,13 @@
protected $_isPartialRendering = false;
/**
+ * Use one error message for array elements with concatenated values
+ *
+ * @var bool
+ */
+ protected $_concatJustValuesInErrorMessage = false;
+
+ /**
* Constructor
*
* $spec may be:
@@ -915,6 +922,28 @@
}
/**
+ * Use one error message for array elements with concatenated values
+ *
+ * @param boolean $concatJustValuesInErrorMessage
+ * @return Zend_Form_Element
+ */
+ public function setConcatJustValuesInErrorMessage($concatJustValuesInErrorMessage)
+ {
+ $this->_concatJustValuesInErrorMessage = $concatJustValuesInErrorMessage;
+ return $this;
+ }
+
+ /**
+ * Use one error message for array elements with concatenated values
+ *
+ * @return boolean
+ */
+ public function getConcatJustValuesInErrorMessage()
+ {
+ return $this->_concatJustValuesInErrorMessage;
+ }
+
+ /**
* Overloading: retrieve object property
*
* Prevents access to properties beginning with '_'.
@@ -2248,7 +2277,12 @@
$aggregateMessages[] = str_replace('%value%', $val, $message);
}
if (count($aggregateMessages)) {
- $messages[$key] = implode($this->getErrorMessageSeparator(), $aggregateMessages);
+ if ($this->_concatJustValuesInErrorMessage) {
+ $values = implode($this->getErrorMessageSeparator(), $value);
+ $messages[$key] = str_replace('%value%', $values, $message);
+ } else {
+ $messages[$key] = implode($this->getErrorMessageSeparator(), $aggregateMessages);
+ }
}
} else {
$messages[$key] = str_replace('%value%', $value, $message);