php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-12-01 23:51:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Method yii\authclient\BaseOAuth::mergeCurlOptions() advanced to merge array values

Browse Source
This commit is contained in:
Klimov Paul
2014-07-11 12:30:30 +03:00
parent fbce722d85
commit a1a9d9a3bc
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/authclient/BaseOAuth.php
View File

@@ -223,9 +223,13 @@ abstract class BaseOAuth extends BaseClient implements ClientInterface
while (!empty($args)) { while (!empty($args)) {
$next = array_shift($args); $next = array_shift($args);
foreach ($next as $k => $v) { foreach ($next as $k => $v) {
if (is_array($v) && !empty($res[$k]) && is_array($res[$k])) {
$res[$k] = array_merge($res[$k], $v);
} else {
$res[$k] = $v; $res[$k] = $v;
} }
} }
}
return $res; return $res;
} }