diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-05-30 20:46:41 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-05-30 20:46:41 +0200 |
| commit | 185dba88c1da23f3fa4e787635e42fd81002b2cc (patch) | |
| tree | 8122644648450a7722b617a0d106bca4d1106d95 /app/Models/Context.php | |
| parent | ca58a265e6a702e42e25f5bf2393896b5517b0be (diff) | |
| parent | 00e00849815f35ab3e3a1da2cbfa515f4bace392 (diff) | |
Merge 1.1.1-dev into /beta
https://github.com/FreshRSS/FreshRSS/issues/845
Diffstat (limited to 'app/Models/Context.php')
| -rw-r--r-- | app/Models/Context.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/Models/Context.php b/app/Models/Context.php index 1c770c756..dbdbfaa69 100644 --- a/app/Models/Context.php +++ b/app/Models/Context.php @@ -30,7 +30,7 @@ class FreshRSS_Context { public static $state = 0; public static $order = 'DESC'; public static $number = 0; - public static $search = ''; + public static $search; public static $first_id = ''; public static $next_id = ''; public static $id_max = ''; @@ -301,4 +301,5 @@ class FreshRSS_Context { } return false; } + } |