From a7e833280954a537e12d5a3f4fa12a5b9e8412da Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 14 Jun 2014 08:58:33 +0200
Subject: Improve system of queries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Coding style
- More checks server side
- Default query name is "Query n°X"
- List of queries is moved into nav_menu, in a dropdown
- Better system to remove fields in JS (to a.remove elements, give an
  attibute data-remove="id_to_remove")
- Fix a bug in lib/Mine/Request.php (htmlspecialchars_utf8 can be applied on
  arrays now)
- Few theme improvements
- Add an element .no-mobile to apply to elements which should not appear on
  mobiles

See https://github.com/marienfressinaud/FreshRSS/pull/498
---
 app/Models/Configuration.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index b0ce70000..ffd20deca 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -223,7 +223,13 @@ class FreshRSS_Configuration {
 	public function _queries ($values) {
 		$this->data['queries'] = array();
 		foreach ($values as $value) {
-			$this->data['queries'][] = array_filter($value);
+			$value = array_filter($value);
+			$params = $value;
+			unset($params['name']);
+			unset($params['url']);
+			$value['url'] = Minz_Url::display(array('params' => $params));
+
+			$this->data['queries'][] = $value;
 		}
 	}
 	public function _theme($value) {
-- 
cgit v1.2.3