aboutsummaryrefslogtreecommitdiff
path: root/app/Models/UserQuery.php
diff options
context:
space:
mode:
Diffstat (limited to 'app/Models/UserQuery.php')
-rw-r--r--app/Models/UserQuery.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/app/Models/UserQuery.php b/app/Models/UserQuery.php
index 7f8aa07ef..236813942 100644
--- a/app/Models/UserQuery.php
+++ b/app/Models/UserQuery.php
@@ -39,6 +39,14 @@ class FreshRSS_UserQuery {
if (isset($query['order'])) {
$this->order = $query['order'];
}
+ if (empty($query['url'])) {
+ if (!empty($query)) {
+ unset($query['name']);
+ $this->url = Minz_Url::display(array('params' => $query));
+ }
+ } else {
+ $this->url = $query['url'];
+ }
if (!isset($query['search'])) {
$query['search'] = '';
}
@@ -47,9 +55,6 @@ class FreshRSS_UserQuery {
if (isset($query['state'])) {
$this->state = $query['state'];
}
- if (isset($query['url'])) {
- $this->url = $query['url'];
- }
}
/**