diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-10-20 11:38:58 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-10-20 11:38:58 +0200 |
| commit | 9ffd56ea68caaaff49efefacf501e07298eca7e2 (patch) | |
| tree | 8c8448b652b0280265c98d42c81348d2c0dad409 /app/Controllers | |
| parent | 8a45743b9036078344ea362b183358f8ca8e4dd3 (diff) | |
| parent | 7f2b0439ec4158ee7d78571d60e9bcc995e87cac (diff) | |
Merge pull request #1335 from Alkarex/guid-ascii-bug
guid and urls should not contain low/high characters
Diffstat (limited to 'app/Controllers')
| -rwxr-xr-x | app/Controllers/feedController.php | 2 | ||||
| -rw-r--r-- | app/Controllers/importExportController.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index 8751d2fff..ed3229687 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -314,7 +314,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController { if (count($entries) > 0) { $newGuids = array(); foreach ($entries as $entry) { - $newGuids[] = $entry->guid(); + $newGuids[] = safe_ascii($entry->guid()); } // For this feed, check existing GUIDs already in database. $existingHashForGuids = $entryDAO->listHashForFeedGuids($feed->id(), $newGuids); diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index d36c57deb..a1f789805 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -362,7 +362,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { $newGuids = array(); foreach ($article_object['items'] as $item) { - $newGuids[] = $item['id']; + $newGuids[] = safe_ascii($item['id']); } // For this feed, check existing GUIDs already in database. $existingHashForGuids = $this->entryDAO->listHashForFeedGuids($feed->id(), $newGuids); |