From 2a40a485f0acc08ecc8f0b03babee58401b4158d Mon Sep 17 00:00:00 2001
From: Martin Kutschker <martin.t.kutschker@blackbox.net>
Date: Wed, 5 Sep 2007 07:42:24 +0000
Subject: [PATCH] Feature #2883: improve t3lib_div::trimExplode()

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2487 709f56b5-9817-0410-a4d7-c38de5d9e867
---
 ChangeLog                 |  5 +++++
 t3lib/class.t3lib_div.php | 20 +++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e96f941b2f38..643476d7ba08 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+
+2007-09-05  Martin Kutschker  <martin.t.kutschker@blackbox.net>
+
+	* Feature #2883: improve t3lib_div::trimExplode()
+
 2007-09-05  Dmitry Dulepov  <dmitry@typo3.org>
 
 	* Added Georgian language to TYPO3
diff --git a/t3lib/class.t3lib_div.php b/t3lib/class.t3lib_div.php
index c5c19dd45581..745398987256 100755
--- a/t3lib/class.t3lib_div.php
+++ b/t3lib/class.t3lib_div.php
@@ -1451,15 +1451,21 @@ class t3lib_div {
 	 * @return	array		Exploded values
 	 */
 	function trimExplode($delim, $string, $onlyNonEmptyValues=0)	{
-		$temp = explode($delim,$string);
-		$newtemp=array();
-		while(list($key,$val)=each($temp))	{
-			if (!$onlyNonEmptyValues || strcmp('',trim($val)))	{
-				$newtemp[]=trim($val);
+		$array = explode($delim, $string);
+		if ($onlyNonEmptyValues) {
+			foreach($array as $index => &$value) {
+				$value = trim($value);
+				if ($value == '') {
+					unset($array[$index]);
+				}
+			}
+			$array = array_merge($array);
+		} else {
+			foreach($array as $key => &$value) {
+				$value = trim($value);
 			}
 		}
-		reset($newtemp);
-		return $newtemp;
+		return $array;
 	}
 
 	/**
-- 
2.20.1