Merge tag 'v0.10.4' into latest

Release v0.10.4

6 files changed, 16 insertions, 5 deletions

diff --git a/AUTHORS b/AUTHORS
index 8d06b930..f91a770e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
-   715  ArthurHoaro <arthur@hoa.ro>
-   370  VirtualTam <virtualtam@flibidi.net>
+   716  ArthurHoaro <arthur@hoa.ro>
+   372  VirtualTam <virtualtam@flibidi.net>
    208  nodiscc <nodiscc@gmail.com>
     56  Sébastien Sauvage <sebsauvage@sebsauvage.net>
     15  Florian Eula <eula.florian@gmail.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4f77fa9..c08e42ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v0.10.4](https://github.com/shaarli/Shaarli/releases/tag/v0.10.4) - 2019-04-16
+
+### Fixed
+- Fix thumbnails disabling if PHP GD is not installed
+- Fix a warning if links sticky status isn't set
 
 ## [v0.10.3](https://github.com/shaarli/Shaarli/releases/tag/v0.10.3) - 2019-02-23
 ### Added
diff --git a/application/LinkDB.php b/application/LinkDB.php
index 4bbc2950..803757ca 100644
--- a/application/LinkDB.php
+++ b/application/LinkDB.php
@@ -259,7 +259,8 @@ You use the community supported version of the original Shaarli project, by Seba
             ),
             'private'=>0,
             'created'=> new DateTime(),
-            'tags'=>'opensource software'
+            'tags'=>'opensource software',
+            'sticky' => false,
         );
         $link['shorturl'] = link_small_hash($link['created'], $link['id']);
         $this->links[1] = $link;
@@ -272,6 +273,7 @@ You use the community supported version of the original Shaarli project, by Seba
             'private'=>1,
             'created'=> new DateTime('1 minute ago'),
             'tags'=>'secretstuff',
+            'sticky' => false,
         );
         $link['shorturl'] = link_small_hash($link['created'], $link['id']);
         $this->links[0] = $link;
@@ -323,6 +325,8 @@ You use the community supported version of the original Shaarli project, by Seba
                 $link['real_url'] = $link['url'];
             }
 
+            $link['sticky'] = isset($link['sticky']) ? $link['sticky'] : false;
+
             // To be able to load links before running the update, and prepare the update
             if (! isset($link['created'])) {
                 $link['id'] = $link['linkdate'];
diff --git a/application/Thumbnailer.php b/application/Thumbnailer.php
index 37ed97a1..167d6296 100644
--- a/application/Thumbnailer.php
+++ b/application/Thumbnailer.php
@@ -55,7 +55,7 @@ class Thumbnailer
         $this->conf = $conf;
 
         if (! $this->checkRequirements()) {
-            $this->conf->set('thumbnails.enabled', false);
+            $this->conf->set('thumbnails.mode', Thumbnailer::MODE_NONE);
             $this->conf->write(true);
             // TODO: create a proper error handling system able to catch exceptions...
             die(t(
diff --git a/index.php b/index.php
index acfcc660..4deed197 100644
--- a/index.php
+++ b/index.php
@@ -1179,6 +1179,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/shaarli_version.php b/shaarli_version.php
index 215fc76f..7db5053d 100644
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
-<?php /* 0.10.3 */ ?>
+<?php /* 0.10.4 */ ?>