adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merging changes from 1.2.x.x Set class to 1.1.x.x branch

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4792 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-04-05 20:09:32 +00:00
parent a677c882e7
commit 135ebe8994
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/set.php
View file

@ -60,7 +60,6 @@ class Set extends Object {
function &get() { function &get() {
return $this->value; return $this->value;
} }
/** /**
* This function can be thought of as a hybrid between PHP's array_merge and array_merge_recursive. The difference * This function can be thought of as a hybrid between PHP's array_merge and array_merge_recursive. The difference
* to the two is that if an array key contains another array then the function behaves recursive (unlike array_merge) * to the two is that if an array key contains another array then the function behaves recursive (unlike array_merge)
@ -71,6 +70,7 @@ class Set extends Object {
* @param array $arr1 * @param array $arr1
* @param array $arr2 * @param array $arr2
* @return array * @return array
* @access public
*/ */
function merge($arr1, $arr2 = null) { function merge($arr1, $arr2 = null) {
// Get all arguments that were passed to the function // Get all arguments that were passed to the function