From 0fce9892ff2b03083706b4f78495539861db98aa Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 12 Nov 2018 09:03:20 +0100
Subject: API encoding tuning (#2120)

Use only minimal XML->Unicode encoding for articles title.
Follow-up of https://github.com/FreshRSS/FreshRSS/pull/2093
---
 p/api/greader.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'p/api/greader.php')

diff --git a/p/api/greader.php b/p/api/greader.php
index 7c5c54951..7cd312f2c 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -300,7 +300,7 @@ function subscriptionList() {
 	foreach ($res as $line) {
 		$subscriptions[] = array(
 			'id' => 'feed/' . $line['id'],
-			'title' => escapeToUnicodeAlternative($line['name']),
+			'title' => escapeToUnicodeAlternative($line['name'], true),
 			'categories' => array(
 				array(
 					'id' => 'user/-/label/' . htmlspecialchars_decode($line['c_name'], ENT_QUOTES),
@@ -506,7 +506,7 @@ function entriesToArray($entries) {
 			'crawlTimeMsec' => substr($entry->id(), 0, -3),
 			'timestampUsec' => '' . $entry->id(),	//EasyRSS
 			'published' => $entry->date(true),
-			'title' => escapeToUnicodeAlternative($entry->title()),
+			'title' => escapeToUnicodeAlternative($entry->title(), false),
 			'summary' => array('content' => $entry->content()),
 			'alternate' => array(
 				array('href' => htmlspecialchars_decode($entry->link(), ENT_QUOTES)),
@@ -517,14 +517,14 @@ function entriesToArray($entries) {
 			),
 			'origin' => array(
 				'streamId' => 'feed/' . $f_id,
-				'title' => escapeToUnicodeAlternative($f_name),	//EasyRSS
+				'title' => escapeToUnicodeAlternative($f_name, true),	//EasyRSS
 				//'htmlUrl' => $line['f_website'],
 			),
 		);
 		$author = $entry->authors(true);
 		$author = trim($author, '; ');
 		if ($author != '') {
-			$item['author'] = escapeToUnicodeAlternative($author);
+			$item['author'] = escapeToUnicodeAlternative($author, false);
 		}
 		if ($entry->isRead()) {
 			$item['categories'][] = 'user/-/state/com.google/read';
-- 
cgit v1.2.3