Skip to content

Commit 8cb5462

Browse files
committed
Fix conflict from merge.
1 parent 20d5e4c commit 8cb5462

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/Infusionsoft/Infusionsoft.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -372,13 +372,9 @@ public function request()
372372
// Some older methods in the API require a key parameter to be sent
373373
// even if OAuth is being used. This flag can be made false as it
374374
// will break some newer endpoints.
375-
if ($this->needsEmptyKey) {
376-
// Some older methods in the API require a key parameter to be sent
377-
// even if OAuth is being used. This flag can be made false as it
378-
// will break some newer endpoints.
379-
if ( $this->needsEmptyKey ) {
380-
$args = array_merge( array( 'key' => $token->getAccessToken() ), $args );
381-
}
375+
if ($this->needsEmptyKey)
376+
{
377+
$params = array_merge(array('key' => $token->getAccessToken()), $params);
382378
}
383379

384380
// Reset the empty key flag back to the default for the next request

0 commit comments

Comments
 (0)