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

Merge pull request #1270 from ArthurHoaro/hotfix/sticky-warning 

Fix a warning if links sticky status isn't set
This commit is contained in:
ArthurHoaro 2019-02-24 11:30:35 +01:00 committed by GitHub
parent 015314f3c6 b790f900c9
commit c21dcc8199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/bookmark/LinkDB.php
View File

@ -252,7 +252,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;
@ -265,6 +266,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;
@ -306,6 +308,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'];

2
index.php
View File

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