diff --git a/cake/libs/set.php b/cake/libs/set.php index c5315cc8f1d..f677b72944a 100644 --- a/cake/libs/set.php +++ b/cake/libs/set.php @@ -329,7 +329,7 @@ function format($data, $format, $keys) { for ($j = 0; $j < $count; $j++) { $args = array(); for ($i = 0; $i < $count2; $i++) { - if (isset($data[$i][$j])) { + if (array_key_exists($j, $data[$i])) { $args[] = $data[$i][$j]; } } diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php index fd14c031e16..3484299ad56 100644 --- a/cake/tests/cases/libs/set.test.php +++ b/cake/tests/cases/libs/set.test.php @@ -2160,6 +2160,26 @@ function testFormatting() { $expected = array('Nate, 42', 'Larry, 0', 'Garrett, 0'); $this->assertEqual($result, $expected); } +/** + * testFormattingNullValues method + * + * @return void + */ + public function testFormattingNullValues() { + $data = array( + array('Person' => array('first_name' => 'Nate', 'last_name' => 'Abele', 'city' => 'Boston', 'state' => 'MA', 'something' => '42')), + array('Person' => array('first_name' => 'Larry', 'last_name' => 'Masters', 'city' => 'Boondock', 'state' => 'TN', 'something' => null)), + array('Person' => array('first_name' => 'Garrett', 'last_name' => 'Woodworth', 'city' => 'Venice Beach', 'state' => 'CA', 'something' => null))); + + $result = Set::format($data, '%s', array('{n}.Person.something')); + $expected = array('42', '', ''); + $this->assertEqual($expected, $result); + + $result = Set::format($data, '{0}, {1}', array('{n}.Person.city', '{n}.Person.something')); + $expected = array('Boston, 42', 'Boondock, ', 'Venice Beach, '); + $this->assertEqual($expected, $result); + } + /** * testCountDim method *