details

julien-nc · julien-nc · commit e27a33067d51 · 2023-01-05T12:14:11.000+01:00
Signed-off-by: Julien Veyssier &lt;julien-nc@posteo.net&gt;
diff --git a/lib/Service/GoogleAPIService.php b/lib/Service/GoogleAPIService.php
@@ -277,7 +277,7 @@ public function simpleRequest(string $userId, string $url, array $params = [], s
 				return ['error' => $this->l10n->t('Bad credentials')];
 			} else {
 				return [
-					'content' => $body,
+					'body' => $body,
 					'headers' => $response->getHeaders(),
 				];
 			}
diff --git a/lib/Service/GoogleContactsAPIService.php b/lib/Service/GoogleContactsAPIService.php
@@ -317,7 +317,7 @@ public function importContacts(string $userId, ?string $uri, int $key, ?string $
 								}
 							}
 
-							$b64Photo = stripslashes('data:image/' . strtolower($type) . ';base64\,') . base64_encode($photoFile['content']);
+							$b64Photo = stripslashes('data:image/' . strtolower($type) . ';base64\,') . base64_encode($photoFile['body']);
 							try {
 								$prop = $vCard->createProperty(
 									'PHOTO',

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ public function simpleRequest(string $userId, string $url, array $params = [], s`
`277`	`277`	`return ['error' => $this->l10n->t('Bad credentials')];`
`278`	`278`	`} else {`
`279`	`279`	`return [`
`280`		`- 'content' => $body,`
	`280`	`+ 'body' => $body,`
`281`	`281`	`'headers' => $response->getHeaders(),`
`282`	`282`	`];`
`283`	`283`	`}`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ public function importContacts(string $userId, ?string $uri, int $key, ?string $`
`317`	`317`	`}`
`318`	`318`	`}`
`319`	`319`
`320`		`- $b64Photo = stripslashes('data:image/' . strtolower($type) . ';base64\,') . base64_encode($photoFile['content']);`
	`320`	`+ $b64Photo = stripslashes('data:image/' . strtolower($type) . ';base64\,') . base64_encode($photoFile['body']);`
`321`	`321`	`try {`
`322`	`322`	`$prop = $vCard->createProperty(`
`323`	`323`	`'PHOTO',`