Merge branch 'v0.11' into stable

diff --cc CHANGELOG.md
index 2b2ee62edcfe3b683255733677eec1c16f8ced6d,abf802ead6c89a2663f843860b124d4226e49135..e4991c4d7ce9c5d3d59229fd4793290ead11dd23
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -282,7 -339,7 +339,7 @@@ configuration to enable URL rewriting, 
          - `/api/v1/info`: get general information on the Shaarli instance
          - `/api/v1/links`: get a list of shaared links
          - `/api/v1/history`: get a list of latest actions
--Theming:
++          Theming:
      - Introduce a new theme
      - Allow selecting themes/templates from the configuration page
      - New/Edit link form can be submitted using CTRL+Enter in the textarea
@@@ -580,12 -637,12 +637,12 @@@ Please use our release archives, or fol
  - Cleanup: introduce an `ApplicationUtils` class
  
  ### Removed
-- - Cleanup: remove `json_encode()` function (built-in since PHP 5.2)
++- Cleanup: remove `json_encode()` function (built-in since PHP 5.2)
  
  ### Fixed
-- - Auto-complete more than one tag
-- - Bookmarklet: support titles containing quotes
-- - URL encode links when setting a redirector
++- Auto-complete more than one tag
++- Bookmarklet: support titles containing quotes
++- URL encode links when setting a redirector
  
  
  ## [v0.6.0](https://github.com/shaarli/Shaarli/releases/tag/v0.6.0) - 2015-11-18
@@@ -1222,8 -1279,8 +1279,8 @@@ Initial release on GitHub
  - In tag autocomplete, tags are presented in use order
    (most used tags first, instead of alphabetical order)
  - RSS Feed can now be filtered by tags or fulltext search. Just add to the feed url:
--  - `&searchtags=minecraft+video` for tag filtering
--  - `&searchterm=portal` for fulltext search to the feed url
++    - `&searchtags=minecraft+video` for tag filtering
++    - `&searchterm=portal` for fulltext search to the feed url
  
  
  ## [v0.0.12beta](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)

diff --cc application/bookmark/LinkDB.php
index 803757cae5c02c1fffed2f5257b57ff798ef5a07,efde8468fca97e896f1da161e444993bdd711b4d..76ba95f0dbd7a5a309ddb2f832f86fe6b5c81273
--- 1/application/LinkDB.php
--- 2/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']) : '';

diff --cc application/updater/Updater.php
Simple merge

diff --cc index.php
Simple merge

diff --cc tests/updater/UpdaterTest.php
Simple merge