Merge branch 'FreshRSS/dev' into PubSubHubbub

4 files changed, 31 insertions, 46 deletions

diff --git a/CHANGELOG b/CHANGELOG.md
index ed1f655f9..a51aaa3b1 100644
--- a/CHANGELOG
+++ b/CHANGELOG.md
@@ -11,6 +11,11 @@
 * Features
 	* New option to detect and mark updated articles as unread.
 	* Support for internationalized domain name (IDN).
+* API
+	* Work-around for News+ bug when there is no unread article on the server.
+* Bug fixing
+	* Corrected bug introduced in previous beta about handling of HTTP 301 (feeds that have changed address) 
+	* Corrected bug in FreshRSS RSS feeds.
 * Misc.
 	* Improved logic for automatic deletion of old articles.
 	* Attempt to better handle encoded titles.
@@ -74,7 +79,7 @@
 * Misc.
 	* Add option to remove articles after reading them
 	* Add comments
-	* Refactor i18n system to not load unnecessary strings
+	* Refactor i18n system to avoid loading unnecessary strings
 	* Fix security issue in Minz_Error::error() method
 	* Fix redirection after refreshing a given feed
 
@@ -97,7 +102,7 @@
 * I18n
 	* Introduce a new system for i18n keys (not finished yet)
 * Misc.
-	* Fix global view (didn't work anymore)
+	* Fix global view (did not work anymore)
 	* Add do_post_update for update system
 	* Introduce ```checkInstallAction``` to test if FreshRSS installation is ok
 
@@ -107,7 +112,7 @@
 * UI
 	* Add a space after tag icon
 * Statistics
-	* Add an average per day on the 30 day period graph
+	* Add an average per day on the 30-day period graph
 	* Add percent of total on top 10 feed
 * Bug fixes
 	* Fix "mark as read" in global view
@@ -156,7 +161,7 @@
 	* Changed lazyload implementation
 	* Support of HTML5 notifications for new upcoming articles
 	* Add option to stay logged in
-* Bux fixes in export function, add/remove users, keyboard shortcuts, etc.
+* Bug fixes in export function, add/remove users, keyboard shortcuts, etc.
 
 
 ## 2014-07-21 FreshRSS 0.7.3
diff --git a/CREDITS b/CREDITS
deleted file mode 100644
index c2c6642dc..000000000
--- a/CREDITS
+++ /dev/null
@@ -1,42 +0,0 @@
-This is a credit file of people who have contributed to FreshRSS with, at least,
-one commit on the FreshRSS repository (at https://github.com/FreshRSS/FreshRSS).
-Please note a commit on THIS specific file is not considered as a contribution
-(too easy!). It's purpose is to show even the smallest contribution is important.
-People are sorted by name so please keep this order.
-
----
-
-Alexandre Alapetite
-https://github.com/Alkarex
-
-Alexis Degrugillier
-https://github.com/aledeg
-
-Alwaysin
-https://github.com/Alwaysin
-
-Amaury Carrade
-https://github.com/AmauryCarrade
-
-ealdraed
-https://github.com/ealdraed
-
-Luc Didry
-https://github.com/ldidry
-
-Marien Fressinaud
-dev@marienfressinaud.fr
-http://marienfressinaud.fr
-https://github.com/marienfressinaud
-
-Melvyn Laïly
-https://github.com/yaurthek
-
-Nicolas Elie
-https://github.com/nicolaselie
-
-plopoyop
-https://github.com/plopoyop
-
-tomgue
-https://github.com/tomgue
diff --git a/CREDITS.md b/CREDITS.md
new file mode 100644
index 000000000..4eadf90b9
--- /dev/null
+++ b/CREDITS.md
@@ -0,0 +1,19 @@
+This is a credit file of people who have [contributed to FreshRSS](https://github.com/FreshRSS/FreshRSS/graphs/contributors) with, at least,
+one commit on the FreshRSS repository (at https://github.com/FreshRSS/FreshRSS).
+Please note a commit on THIS specific file is not considered as a contribution
+(too easy!). Its purpose is to show that even the smallest contribution is important.
+People are sorted by name so please keep this order.
+
+---
+
+* [Alexandre Alapetite](https://github.com/Alkarex): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Alkarex), [Web](http://alexandre.alapetite.fr/)
+* [Alexis Degrugillier](https://github.com/aledeg): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=aledeg)
+* [Alwaysin](https://github.com/Alwaysin): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Alwaysin)
+* [Amaury Carrade](https://github.com/AmauryCarrade): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=AmauryCarrade)
+* [ealdraed](https://github.com/ealdraed): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ealdraed)
+* [Luc Didry](https://github.com/ldidry): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ldidry)
+* [Marien Fressinaud](https://github.com/marienfressinaud): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=marienfressinaud), [Web](http://marienfressinaud.fr/), [Email](mailto:dev@marienfressinaud.fr)
+* [Melvyn Laïly](https://github.com/yaurthek): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=yaurthek)
+* [Nicolas Elie](https://github.com/nicolaselie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=nicolaselie)
+* [plopoyop](https://github.com/plopoyop): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=plopoyop)
+* [tomgue](https://github.com/tomgue): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=tomgue)
diff --git a/p/api/greader.php b/p/api/greader.php
index 4554a3f9c..5a23af006 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -467,6 +467,9 @@ function streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude
 	$entryDAO = FreshRSS_Factory::createEntryDao();
 	$ids = $entryDAO->listIdsWhere($type, $id, $state, $order === 'o' ? 'ASC' : 'DESC', $count, '', new FreshRSS_Search(''), $start_time);
 
+	if (empty($ids)) {	//For News+ bug https://github.com/noinnion/newsplus/issues/84#issuecomment-57834632
+		$ids[] = 0;
+	}
 	$itemRefs = array();
 	foreach ($ids as $id) {
 		$itemRefs[] = array(