mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-06 22:23:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor removing query by get param

Browse Source 
See https://github.com/marienfressinaud/FreshRSS/issues/625
This commit is contained in:
Marien Fressinaud
2014-09-24 13:28:09 +02:00
parent 666162ae56
commit 5a1baff9be
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Controllers/configureController.php
View File

@@ -59,15 +59,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
$catDAO->deleteCategory($ids[$key]);
// Remove related queries.
$final_queries = array();
$id_cat_in_query = 'c_' . $ids[$key];
foreach ($this->view->conf->queries as $key => $query) {
if (empty($query['get']) ||
$query['get'] !== $id_cat_in_query) {
$final_queries[$key] = $query;
}
}
$this->view->conf->_queries($final_queries);
$this->view->conf->remove_query_by_get('c_' . $ids[$key]);
$this->view->conf->save();
}
}

10
app/Models/Configuration.php
View File

@@ -124,6 +124,16 @@ class FreshRSS_Configuration {
return $this->available_languages;
}
public function remove_query_by_get($get) {
$final_queries = array();
foreach ($this->queries as $key => $query) {
if (empty($query['get']) || $query['get'] !== $get) {
$final_queries[$key] = $query;
}
}
$this->_queries($final_queries);
}
public function _language($value) {
if (!isset($this->available_languages[$value])) {
$value = 'en';