adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing issue where value of '$and' was appended to output string even when list array contained only one element. Fixed #285

Browse source
This commit is contained in:
ADmad 2010-01-31 23:37:54 +05:30
parent 3f9813a9ec
commit 59a4732eb8
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cake/libs/view/helpers/text.php
View file

@ -336,7 +336,11 @@ class TextHelper extends AppHelper {
* @access public
*/
function toList($list, $and = 'and', $separator = ', ') {
return implode($separator, array_slice($list, null, -1)) . ' ' . $and . ' ' . array_pop($list);
if (count($list) > 1) {
return implode($separator, array_slice($list, null, -1)) . ' ' . $and . ' ' . array_pop($list);
} else {
return array_pop($list);
}
}
}
?>

6
cake/tests/cases/libs/view/helpers/text.test.php
View file

@ -355,6 +355,12 @@ class TextHelperTest extends CakeTestCase {
* @return void
*/
function testListGeneration() {
$result = $this->Text->toList(array());
$this->assertEqual($result, '');
$result = $this->Text->toList(array('One'));
$this->assertEqual($result, 'One');
$result = $this->Text->toList(array('Larry', 'Curly', 'Moe'));
$this->assertEqual($result, 'Larry, Curly and Moe');