diff options
-rw-r--r-- | application/LinkDB.php | 12 | ||||
-rw-r--r-- | tpl/linklist.html | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/application/LinkDB.php b/application/LinkDB.php index 16848519..19ca6435 100644 --- a/application/LinkDB.php +++ b/application/LinkDB.php | |||
@@ -63,11 +63,6 @@ class LinkDB implements Iterator, Countable, ArrayAccess | |||
63 | private $_redirector; | 63 | private $_redirector; |
64 | 64 | ||
65 | /** | 65 | /** |
66 | * @var LinkFilter instance. | ||
67 | */ | ||
68 | private $linkFilter; | ||
69 | |||
70 | /** | ||
71 | * Creates a new LinkDB | 66 | * Creates a new LinkDB |
72 | * | 67 | * |
73 | * Checks if the datastore exists; else, attempts to create a dummy one. | 68 | * Checks if the datastore exists; else, attempts to create a dummy one. |
@@ -85,7 +80,6 @@ class LinkDB implements Iterator, Countable, ArrayAccess | |||
85 | $this->_redirector = $redirector; | 80 | $this->_redirector = $redirector; |
86 | $this->_checkDB(); | 81 | $this->_checkDB(); |
87 | $this->_readDB(); | 82 | $this->_readDB(); |
88 | $this->linkFilter = new LinkFilter($this->_links); | ||
89 | } | 83 | } |
90 | 84 | ||
91 | /** | 85 | /** |
@@ -349,9 +343,11 @@ You use the community supported version of the original Shaarli project, by Seba | |||
349 | * | 343 | * |
350 | * @return array filtered links | 344 | * @return array filtered links |
351 | */ | 345 | */ |
352 | public function filter($type, $request, $casesensitive = false, $privateonly = false) { | 346 | public function filter($type, $request, $casesensitive = false, $privateonly = false) |
347 | { | ||
348 | $linkFilter = new LinkFilter($this->_links); | ||
353 | $requestFilter = is_array($request) ? implode(' ', $request) : $request; | 349 | $requestFilter = is_array($request) ? implode(' ', $request) : $request; |
354 | return $this->linkFilter->filter($type, trim($requestFilter), $casesensitive, $privateonly); | 350 | return $linkFilter->filter($type, trim($requestFilter), $casesensitive, $privateonly); |
355 | } | 351 | } |
356 | 352 | ||
357 | /** | 353 | /** |
diff --git a/tpl/linklist.html b/tpl/linklist.html index 6ce59dd8..ca91699e 100644 --- a/tpl/linklist.html +++ b/tpl/linklist.html | |||
@@ -23,7 +23,7 @@ | |||
23 | value="{function="implode(' ', $search_crits)"}" | 23 | value="{function="implode(' ', $search_crits)"}" |
24 | {/if} | 24 | {/if} |
25 | autocomplete="off" class="awesomplete" data-multiple data-minChars="1" | 25 | autocomplete="off" class="awesomplete" data-multiple data-minChars="1" |
26 | data-list="{loop="$tags"}{$key}, {/loop}"> | 26 | data-list="{loop="$tags"}{$key}, {/loop}" |
27 | > | 27 | > |
28 | <input type="submit" value="Search" class="bigbutton"> | 28 | <input type="submit" value="Search" class="bigbutton"> |
29 | </form> | 29 | </form> |