Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Release v0.10.4

Browse source 
-----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
This commit is contained in:
Knah Tsaeb 2019-07-11 11:44:51 +02:00
commit 7fe2910525
6 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AUTHORS
View file

@ -1,5 +1,5 @@
715 ArthurHoaro <arthur@hoa.ro> 716 ArthurHoaro <arthur@hoa.ro>
370 VirtualTam <virtualtam@flibidi.net> 372 VirtualTam <virtualtam@flibidi.net>
208 nodiscc <nodiscc@gmail.com> 208 nodiscc <nodiscc@gmail.com>
56 Sébastien Sauvage <sebsauvage@sebsauvage.net> 56 Sébastien Sauvage <sebsauvage@sebsauvage.net>
15 Florian Eula <eula.florian@gmail.com> 15 Florian Eula <eula.florian@gmail.com>

5
CHANGELOG.md
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/) The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/). 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 ## [v0.10.3](https://github.com/shaarli/Shaarli/releases/tag/v0.10.3) - 2019-02-23
### Added ### Added

6
application/LinkDB.php
View file

@ -259,7 +259,8 @@ private function check()
), ),
'private'=>0, 'private'=>0,
'created'=> new DateTime(), 'created'=> new DateTime(),
'tags'=>'opensource software' 'tags'=>'opensource software',
'sticky' => false,
); );
$link['shorturl'] = link_small_hash($link['created'], $link['id']); $link['shorturl'] = link_small_hash($link['created'], $link['id']);
$this->links[1] = $link; $this->links[1] = $link;
@ -272,6 +273,7 @@ private function check()
'private'=>1, 'private'=>1,
'created'=> new DateTime('1 minute ago'), 'created'=> new DateTime('1 minute ago'),
'tags'=>'secretstuff', 'tags'=>'secretstuff',
'sticky' => false,
); );
$link['shorturl'] = link_small_hash($link['created'], $link['id']); $link['shorturl'] = link_small_hash($link['created'], $link['id']);
$this->links[0] = $link; $this->links[0] = $link;
@ -323,6 +325,8 @@ private function read()
$link['real_url'] = $link['url']; $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 // To be able to load links before running the update, and prepare the update
if (! isset($link['created'])) { if (! isset($link['created'])) {
$link['id'] = $link['linkdate']; $link['id'] = $link['linkdate'];

2
application/Thumbnailer.php
View file

@ -55,7 +55,7 @@ public function __construct($conf)
$this->conf = $conf; $this->conf = $conf;
if (! $this->checkRequirements()) { if (! $this->checkRequirements()) {
$this->conf->set('thumbnails.enabled', false); $this->conf->set('thumbnails.mode', Thumbnailer::MODE_NONE);
$this->conf->write(true); $this->conf->write(true);
// TODO: create a proper error handling system able to catch exceptions... // TODO: create a proper error handling system able to catch exceptions...
die(t( die(t(

2
index.php
View file

@ -1207,6 +1207,8 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
$link['thumbnail'] = $thumbnailer->get($url); $link['thumbnail'] = $thumbnailer->get($url);
} }
$link['sticky'] = isset($link['sticky']) ? $link['sticky'] : false;
$pluginManager->executeHooks('save_link', $link); $pluginManager->executeHooks('save_link', $link);
$LINKSDB[$id] = $link; $LINKSDB[$id] = $link;

2
shaarli_version.php
View file

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