5 files changed, 19 insertions, 10 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abf802ea..e4991c4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -339,7 +339,7 @@ configuration to enable URL rewriting, see:
         - `/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
@@ -637,12 +637,12 @@ Please use our release archives, or follow the
 - 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
@@ -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 --git a/application/bookmark/LinkDB.php b/application/bookmark/LinkDB.php
index efde8468..76ba95f0 100644
--- a/application/bookmark/LinkDB.php
+++ b/application/bookmark/LinkDB.php
@@ -102,7 +102,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
         $isLoggedIn,
         $hidePublicLinks
     ) {
-    
+
         $this->datastore = $datastore;
         $this->loggedIn = $isLoggedIn;
         $this->hidePublicLinks = $hidePublicLinks;
@@ -415,7 +415,7 @@ You use the community supported version of the original Shaarli project, by Seba
         $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 --git a/application/updater/Updater.php b/application/updater/Updater.php
index beb9ea9b..30e5247b 100644
--- a/application/updater/Updater.php
+++ b/application/updater/Updater.php
@@ -268,6 +268,8 @@ class Updater
     }
 
     /**
+<<<<<<< HEAD
+=======
      * Rename tags starting with a '-' to work with tag exclusion search.
      */
     public function updateMethodRenameDashTags()
diff --git a/index.php b/index.php
index 9e473936..3a5c35c4 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,12 @@
 <?php
 /**
+<<<<<<< HEAD
+ * Shaarli v0.8.7 - Shaare your links...
+ *
+ * The personal, minimalist, super-fast, database free, bookmarking service.
+=======
  * Shaarli - The personal, minimalist, super-fast, database free, bookmarking service.
+>>>>>>> v0.9.7
  *
  * Friendly fork by the Shaarli community:
  *  - https://github.com/shaarli/Shaarli
@@ -1179,6 +1185,8 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
             $link['thumbnail'] = $thumbnailer->get($url);
         }
 
+        $link['sticky'] = isset($link['sticky']) ? $link['sticky'] : false;
+
         $pluginManager->executeHooks('save_link', $link);
 
         $LINKSDB[$id] = $link;
diff --git a/tests/updater/UpdaterTest.php b/tests/updater/UpdaterTest.php
index 93bc86c1..738b7361 100644
--- a/tests/updater/UpdaterTest.php
+++ b/tests/updater/UpdaterTest.php
@@ -507,7 +507,6 @@ $GLOBALS[\'privateLinkByDefault\'] = true;';
         $this->assertFalse($this->conf->get('security.markdown_escape'));
     }
 
-
     /**
      * Test updateMethodEscapeMarkdown with markdown plugin disabled
      * => setting markdown_escape set to true.