Merge branch 'FreshRSS/dev' into dev

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 2015-xx-xx FreshRSS 1.1.3-beta
+## 2015-09-12 FreshRSS 1.1.3-beta
 
 * UI
 	* Configuration page for global settings such as limits [#958](https://github.com/FreshRSS/FreshRSS/pull/958)
@@ -11,6 +11,7 @@
 	* Session cookie bug [#924](https://github.com/FreshRSS/FreshRSS/issues/924)
 	* Better error handling for PubSubHubbub [#939](https://github.com/FreshRSS/FreshRSS/issues/939)
 	* Fix tag search link from articles [#970](https://github.com/FreshRSS/FreshRSS/issues/970)
+	* Fix all quieries deleted when deleting a feed or category [#982](https://github.com/FreshRSS/FreshRSS/pull/982)
 
 
 ## 2015-07-30 FreshRSS 1.1.2-beta
@@ -53,7 +54,7 @@
 * UI
 	* New confirmation message when leaving a configuration page without saving the changes.
 * Bug fixing
-	* Corrected bug introduced in previous beta about handling of HTTP 301 (feeds that have changed address) 
+	* Corrected bug introduced in previous beta about handling of HTTP 301 (feeds that have changed address)
 	* Corrected bug in FreshRSS RSS feeds.
 * Security
 	* Sanitize HTTP request header `Host`.
@@ -317,7 +318,7 @@
 		* Amélioration des performances
 		* Tolère un beaucoup plus grand nombre d’articles
 		* Compression des données côté MySQL plutôt que côté PHP
-		* Incompatible avec la version 0.6 (nécessite une mise à jour grâce à l’installateur) 
+		* Incompatible avec la version 0.6 (nécessite une mise à jour grâce à l’installateur)
 	* Affichage de la taille de la base de données dans FreshRSS
 	* Correction problème de marquage de tous les favoris comme lus
 * HTML5 :

CREDITS.md

@@ -12,8 +12,12 @@ People are sorted by name so please keep this order.
 * [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)
+* [Marien Fressinaud](https://github.com/marienfressinaud): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=marienfressinaud), [Web](http://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)
+* [Tets42](https://github.com/Tets42):
+[contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Tets42)
+* [thomasE1993](https://github.com/thomasE1993):
+[contributions](https://github.com/FreshRSS/FreshRSS/commits?author=thomasE1993)
 * [tomgue](https://github.com/tomgue): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=tomgue)

app/Models/ConfigurationSetter.php

@@ -119,6 +119,8 @@ class FreshRSS_ConfigurationSetter {
 		foreach ($values as $value) {
 			if ($value instanceof FreshRSS_UserQuery) {
 				$data['queries'][] = $value->toArray();
+			} elseif (is_array($value)) {
+				$data['queries'][] = $value;
 			}
 		}
 	}