Compare commits

...

4 Commits

Author SHA1 Message Date
Knah Tsaeb 7fe2910525 Release v0.10.4
-----BEGIN PGP SIGNATURE-----
 
 iQFLBAABCAA1FiEEEv0k8DWUT53dSMUkR6bSrUEA328FAly1ANsXHHZpcnR1YWx0
 YW1AZmxpYmlkaS5uZXQACgkQR6bSrUEA32/RJQf/ZNv/QG1Gbno7DmoXrW8F1nvg
 gfNRLWkCJkbSVDy66huGaWUo8ysuyV1699+MqOxMEvGzkhpwZpSXDjjOjvaBy3ca
 UKlUQrpJSc8L0VjsryHgYeX83xamw2Fk8syAsvtNxLY4SDW8aSqwFbqXl9eoTSwA
 bGPMIy2wZk/Wh/9B5DB/8QM3vD4Bk5ZJFGbTTeJPhQ0AJ92i8E3lZUjG0C3oA1bG
 TYOrgEYoA2eUrNStRKaKj3i163emzOqTdf56ml+ADQGl45MeHkeuQM7+uZfC5+sG
 y/Zm/8aecNP/OXNO3+oSpxZlQKgINKVdoRQrqODs3LmsoMg/poc+krpzIUbebg==
 =rSrP
 -----END PGP SIGNATURE-----

Merge tag 'v0.10.4' into myShaarli_commu

Release v0.10.4
2019-07-11 11:44:51 +02:00
VirtualTam 1e77e0448b Release v0.10.4
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
2019-04-16 00:04:56 +02:00
VirtualTam 1cc5eaf9de 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 b790f900c9
Author: ArthurHoaro <arthur@hoa.ro>
Date:   Sat Feb 9 14:04:16 2019 +0100

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
2019-04-15 23:57:08 +02:00
ArthurHoaro 0ed9396bfa Fix thumbnails disabling if PHP GD is not installed 2019-04-15 23:51:06 +02:00
6 changed files with 16 additions and 5 deletions

View File

@ -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>

View File

@ -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

View File

@ -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'];

View File

@ -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(

View File

@ -1207,6 +1207,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;

View File

@ -1 +1 @@
<?php /* 0.10.3 */ ?>
<?php /* 0.10.4 */ ?>