]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Bugfix: prevent LinkFilter to work on outdated data.
authorArthurHoaro <arthur@hoa.ro>
Wed, 20 Jan 2016 21:51:56 +0000 (22:51 +0100)
committerArthurHoaro <arthur@hoa.ro>
Wed, 20 Jan 2016 21:51:56 +0000 (22:51 +0100)
application/LinkDB.php
tpl/linklist.html

index 1684851902d0fdc6a0aed4023bea916849f21a6d..19ca64355052ba314ab7d9d29587662aa2d94dc7 100644 (file)
@@ -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);
     }
 
     /**
index 6ce59dd85931f8cbd49a5442f6c4f03d66d4a587..ca91699ee81ff1ede7c4015d4803656dbe787cad 100644 (file)
@@ -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>