patch-2.patch - TYPO3 Core - TYPO3 Forge

Bug #57824 » patch-2.patch

Christian Ludwig, 2014-11-10 23:02

     	 */
     	static protected function removeDuplicatesForInsertion($insertionList, $list = '') {
     		$insertionListParts = preg_split('/\\s*,\\s*/', $insertionList);
     		$insertionList = implode(', ', array_unique($insertionListParts));
     		$cleanInsertionListParts = array();
             foreach ($insertionListParts as $fieldName) {
                 if ($fieldName == '--linebreak--' || !in_array($fieldName, $cleanInsertionListParts)) {
                     $cleanInsertionListParts[] = $fieldName;
+                }
+            }
             $cleanInsertionList = implode(', ', $cleanInsertionListParts);
     		if ($list === '') {
     			return $insertionList;
     			return $cleanInsertionList;
+    		}
     		// Get a list of fieldNames that are present in the list.
     		preg_match_all('/(?:^|,)\\s*\\b([^;,]+)\\b[^,]*/', $list, $listMatches);
     		// Remove the field names from the insertionlist.
     		$fieldReplacePatterns = array();
     		foreach ($listMatches[1] as $fieldName) {
                 if ($fieldName != '--linebreak--') {
     			$fieldReplacePatterns[] = '/(?:^|,)\\s*\\b' . preg_quote($fieldName, '/') . '\\b[^,$]*/';
+    		}
     		return preg_replace($fieldReplacePatterns, '', $insertionList);
+    	}
     		return preg_replace($fieldReplacePatterns, '', $cleanInsertionList);
+    	}
     	/**
     	 * Generates search needles that are used for inserting fields/items into an existing list.

(2-2/2)