]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge tag 'v0.11.0' into latest
authorArthurHoaro <arthur@hoa.ro>
Sat, 27 Jul 2019 10:30:33 +0000 (12:30 +0200)
committerArthurHoaro <arthur@hoa.ro>
Sat, 27 Jul 2019 10:30:33 +0000 (12:30 +0200)
Release v0.11.0

1  2 
application/bookmark/LinkDB.php
index.php

index 803757cae5c02c1fffed2f5257b57ff798ef5a07,efde8468fca97e896f1da161e444993bdd711b4d..76ba95f0dbd7a5a309ddb2f832f86fe6b5c81273
@@@ -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']) : '';
diff --cc index.php
Simple merge