commit 3ed20a7366380d350b3cd830096119018f665980 Author: Joel Pittet Date: Tue Aug 5 08:44:24 2014 -0700 no unique, later filter diff --git a/core/lib/Drupal/Core/Template/Attribute.php b/core/lib/Drupal/Core/Template/Attribute.php index 075ef8b..76281d9 100644 --- a/core/lib/Drupal/Core/Template/Attribute.php +++ b/core/lib/Drupal/Core/Template/Attribute.php @@ -138,13 +138,9 @@ public function addClass() { if (isset($this->storage['class']) && $this->storage['class'] instanceOf AttributeArray) { // Merge the values passed in from the class value array. $classes = array_merge($this->storage['class']->value(), $classes); - // Filter out any empty values. - $classes = array_unique(array_filter($classes)); $this->storage['class']->exchangeArray($classes); } else { - // Filter out any empty values. - $classes = array_unique(array_filter($classes)); $this->offsetSet('class', $classes); } @@ -173,8 +169,6 @@ public function removeClass() { // Remove the values passed in from the value array. $classes = array_diff($this->storage['class']->value(), $classes); - // Filter out any empty values. - $classes = array_unique(array_filter($classes)); $this->storage['class']->exchangeArray($classes); } return $this; diff --git a/core/lib/Drupal/Core/Template/AttributeArray.php b/core/lib/Drupal/Core/Template/AttributeArray.php index c432ba0..dbe8089 100644 --- a/core/lib/Drupal/Core/Template/AttributeArray.php +++ b/core/lib/Drupal/Core/Template/AttributeArray.php @@ -66,6 +66,8 @@ public function offsetExists($offset) { * Implements the magic __toString() method. */ public function __toString() { + // Filter out any empty values before printing. + $this->value = array_filter($this->value); return String::checkPlain(implode(' ', $this->value)); }