From: Arthur <arthur@hoa.ro>
Date: Thu, 21 Jan 2016 18:27:00 +0000 (+0100)
Subject: Merge pull request #444 from dimtion/404_template
X-Git-Tag: v0.6.3~5
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=db36b8812d30d2a1dcb1a5a0544893ee863f45dd;hp=f4c84ad7fc981643d952a4fb4abfcdb85fccf621;p=github%2Fshaarli%2FShaarli.git

Merge pull request #444 from dimtion/404_template

Create 404 template
---

diff --git a/application/LinkDB.php b/application/LinkDB.php
index 16848519..19ca6435 100644
--- a/application/LinkDB.php
+++ b/application/LinkDB.php
@@ -62,11 +62,6 @@ class LinkDB implements Iterator, Countable, ArrayAccess
     // link redirector set in user settings.
     private $_redirector;
 
-    /**
-     * @var LinkFilter instance.
-     */
-    private $linkFilter;
-
     /**
      * Creates a new LinkDB
      *
@@ -85,7 +80,6 @@ class LinkDB implements Iterator, Countable, ArrayAccess
         $this->_redirector = $redirector;
         $this->_checkDB();
         $this->_readDB();
-        $this->linkFilter = new LinkFilter($this->_links);
     }
 
     /**
@@ -349,9 +343,11 @@ You use the community supported version of the original Shaarli project, by Seba
      *
      * @return array filtered links
      */
-    public function filter($type, $request, $casesensitive = false, $privateonly = false) {
+    public function filter($type, $request, $casesensitive = false, $privateonly = false)
+    {
+        $linkFilter = new LinkFilter($this->_links);
         $requestFilter = is_array($request) ? implode(' ', $request) : $request;
-        return $this->linkFilter->filter($type, trim($requestFilter), $casesensitive, $privateonly);
+        return $linkFilter->filter($type, trim($requestFilter), $casesensitive, $privateonly);
     }
 
     /**
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 @@
                     value="{function="implode(' ', $search_crits)"}"
                 {/if}
                 autocomplete="off" class="awesomplete" data-multiple data-minChars="1"
-                data-list="{loop="$tags"}{$key}, {/loop}">
+                data-list="{loop="$tags"}{$key}, {/loop}"
             >
             <input type="submit" value="Search" class="bigbutton">
         </form>