From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 27 Jul 2019 10:30:33 +0000 (+0200)
Subject: Merge tag 'v0.11.0' into latest
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=1b8ed48a0d3964186f4d66d443783f4d250e7147;p=github%2Fshaarli%2FShaarli.git

Merge tag 'v0.11.0' into latest

Release v0.11.0
---

1b8ed48a0d3964186f4d66d443783f4d250e7147
diff --cc application/bookmark/LinkDB.php
index 803757ca,efde8468..76ba95f0
--- a/application/bookmark/LinkDB.php
+++ b/application/bookmark/LinkDB.php
@@@ -104,10 -100,9 +100,9 @@@ class LinkDB implements Iterator, Count
      public function __construct(
          $datastore,
          $isLoggedIn,
-         $hidePublicLinks,
-         $redirector = '',
-         $redirectorEncode = true
+         $hidePublicLinks
      ) {
 -    
++
          $this->datastore = $datastore;
          $this->loggedIn = $isLoggedIn;
          $this->hidePublicLinks = $hidePublicLinks;
@@@ -432,6 -415,7 +415,7 @@@ You use the community supported versio
          $visibility = 'all',
          $untaggedonly = false
      ) {
 -    
++
          // Filter link database according to parameters.
          $searchtags = isset($filterRequest['searchtags']) ? escape($filterRequest['searchtags']) : '';
          $searchterm = isset($filterRequest['searchterm']) ? escape($filterRequest['searchterm']) : '';