From a1a9d9a3bca8c36b878254df1c8932ab2dba7b4e Mon Sep 17 00:00:00 2001
From: Klimov Paul <klimov.paul@gmail.com>
Date: Fri, 11 Jul 2014 12:30:30 +0300
Subject: [PATCH] Method `yii\authclient\BaseOAuth::mergeCurlOptions()` advanced to merge array values
---
extensions/authclient/BaseOAuth.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/extensions/authclient/BaseOAuth.php b/extensions/authclient/BaseOAuth.php
index 5413759..0fad3c3 100644
--- a/extensions/authclient/BaseOAuth.php
+++ b/extensions/authclient/BaseOAuth.php
@@ -223,7 +223,11 @@ abstract class BaseOAuth extends BaseClient implements ClientInterface
while (!empty($args)) {
$next = array_shift($args);
foreach ($next as $k => $v) {
- $res[$k] = $v;
+ if (is_array($v) && !empty($res[$k]) && is_array($res[$k])) {
+ $res[$k] = array_merge($res[$k], $v);
+ } else {
+ $res[$k] = $v;
+ }
}
}
--
libgit2 0.27.1