Avoid HTTP 400 error when fetch "extra" information for Wikipedia pag…

…e and search term includes diacritics
collectiveaccess · Oct 26, 2024 · 0dc8e52 · 0dc8e52
1 parent b2e48b5
commit 0dc8e52
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/helpers/utilityHelpers.php b/app/helpers/utilityHelpers.php
@@ -3382,8 +3382,8 @@ function caQueryExternalWebservice($ps_url) {
 
 		$vs_content = curl_exec($vo_curl);
 
-		if(curl_getinfo($vo_curl, CURLINFO_HTTP_CODE) !== 200) {
-			throw new WebServiceError(_t('An error occurred while querying an external webservice'). _t(" at %1", $ps_url). " ". print_r(curl_getinfo($vo_curl), true));
+		if(($code = curl_getinfo($vo_curl, CURLINFO_HTTP_CODE)) !== 200) {
+			throw new WebServiceError(_t('An error occurred while querying an external webservice'). _t(" at %1 [HTTP code was %2]", $ps_url, $code). " ". print_r(curl_getinfo($vo_curl), true));
 		}
 		curl_close($vo_curl);
 		return $vs_content;

diff --git a/app/lib/Plugins/InformationService/Wikipedia.php b/app/lib/Plugins/InformationService/Wikipedia.php
@@ -177,7 +177,7 @@ public function getExtraInfo($pa_settings, $ps_url) {
 		// readable version of get parameters
 		$va_get_params = array(
 			'action' => 'query',
-			'titles' => self::getPageTitleFromURI($ps_url),
+			'titles' => urlencode(self::getPageTitleFromURI($ps_url)),
 			'prop' => 'pageimages|info|extracts',
 			'inprop' => 'url',
 			'piprop' => 'name|thumbnail',