From 0ed9396bfa12f086369b52cdc0742e3fe72273ec Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 9 Feb 2019 13:05:37 +0100 Subject: [PATCH 1/3] Fix thumbnails disabling if PHP GD is not installed --- application/Thumbnailer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ public function __construct($conf) $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( From 1cc5eaf9dee0e71aefbce1ff0f28c86ff320c053 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Mon, 15 Apr 2019 23:57:08 +0200 Subject: [PATCH 2/3] backport: Fix a warning if links sticky status isn't set - initiate its status to false when the link is created - if not defined, initiate its status to false (can happen if the updater hasn't run) This is a backport of https://github.com/shaarli/Shaarli/pull/1270 Original author information: commit b790f900c937d0d8f6eccc15d2b4c26023f3d276 Author: ArthurHoaro Date: Sat Feb 9 14:04:16 2019 +0100 Signed-off-by: VirtualTam --- application/LinkDB.php | 6 +++++- index.php | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 @@ private function check() ), '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 @@ private function check() '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 @@ private function read() $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/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; From 1e77e0448bbd25675d8c0fe4a73206ad9048904b Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Tue, 16 Apr 2019 00:04:56 +0200 Subject: [PATCH 3/3] Release v0.10.4 Signed-off-by: VirtualTam --- AUTHORS | 4 ++-- CHANGELOG.md | 5 +++++ shaarli_version.php | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index 8d06b930..f91a770e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,5 @@ - 715 ArthurHoaro - 370 VirtualTam + 716 ArthurHoaro + 372 VirtualTam 208 nodiscc 56 Sébastien Sauvage 15 Florian Eula diff --git a/CHANGELOG.md b/CHANGELOG.md index ada0f109..2b2ee62e 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/shaarli_version.php b/shaarli_version.php index 215fc76f..7db5053d 100644 --- a/shaarli_version.php +++ b/shaarli_version.php @@ -1 +1 @@ - +