From 4f94b715ecf893e2ce415ba312f4448a05c19a94 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 9 Jan 2011 22:29:10 -0500
Subject: [PATCH] Revert "Fixing Set::filter() not predictably filtering in a
 recursive fashion.  While a minor change in behavior, more predictable and
 uniform behavior is worth it." Refs #1431

This reverts commit 6e2ffafe54862710d3ae27e726de058b70b83a27.
---
 cake/libs/set.php                  | 16 ++--------------
 cake/tests/cases/libs/set.test.php | 14 +-------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/cake/libs/set.php b/cake/libs/set.php
index 289c5af5946..3d4e89f0217 100644
--- a/cake/libs/set.php
+++ b/cake/libs/set.php
@@ -68,22 +68,10 @@ function merge($arr1, $arr2 = null) {
  * @static
  */
 	function filter($var, $isArray = false) {
-		foreach ((array)$var as $k => $v) {
-			if (!empty($v) && is_array($v)) {
-				$var[$k] = array_filter($v, array('Set', '_filter'));
-			}
+		if (is_array($var) && (!empty($var) || $isArray)) {
+			return array_filter($var, array('Set', 'filter'));
 		}
-		return array_filter($var, array('Set', '_filter'));
-	}
 
-/**
- * Set::filter callback function
- *
- * @param array $var Array to filter.
- * @return boolean
- * @access protected
- */
-	function _filter($var) {
 		if ($var === 0 || $var === '0' || !empty($var)) {
 			return true;
 		}
diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index 9f0d9a596e9..3018c351ae6 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -88,20 +88,8 @@ function testEnum() {
  */
 	function testFilter() {
 		$result = Set::filter(array('0', false, true, 0, array('one thing', 'I can tell you', 'is you got to be', false)));
-		$expected = array('0', 2 => true, 3 => 0, 4 => array('one thing', 'I can tell you', 'is you got to be'));
+		$expected = array('0', 2 => true, 3 => 0, 4 => array('one thing', 'I can tell you', 'is you got to be', false));
 		$this->assertIdentical($result, $expected);
-
-		$result = Set::filter(array(1, array(false)));
-		$expected = array(1);
-		$this->assertEqual($expected, $result);
-
-		$result = Set::filter(array(1, array(false, false)));
-		$expected = array(1);
-		$this->assertEqual($expected, $result);
-
-		$result = Set::filter(array(1, array('empty', false)));
-		$expected = array(1, array('empty'));
-		$this->assertEqual($expected, $result);
 	}
 
 /**