diff options
| author |  plopoyop <clement@iMac-de-Clement.local>
| 2014-09-24 20:06:34 +0200 |
|---|---|---|
| committer | plopoyop <clement@iMac-de-Clement.local>
| 2014-09-24 20:06:34 +0200 |
| commit | c446625c7f6eda76b03fdac228b2f7b4ded74130 (patch) | |
| tree | 42ab49b32804eeca003dfe69d6456ecf732b8fb1 /app/Models/Configuration.php | |
| parent | ffbfbb92cc89c5ae07e0a28ee3477fcd0c44505d (diff) | |
| parent | a12d90d85d86c168a6e8a13345f05897f17958a4 (diff) | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'app/Models/Configuration.php')
| -rw-r--r-- | app/Models/Configuration.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php index f94d82402..91d2ab846 100644 --- a/app/Models/Configuration.php +++ b/app/Models/Configuration.php @@ -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'; @@ -147,7 +157,7 @@ class FreshRSS_Configuration { // left blank on purpose case FreshRSS_Entry::STATE_NOT_READ: // left blank on purpose - case FreshRSS_Entry::STATE_NOT_READ_STRICT: + case FreshRSS_Entry::STATE_STRICT + FreshRSS_Entry::STATE_NOT_READ: $this->data['default_view'] = $value; break; default: |