diff options
author | VirtualTam <virtualtam@flibidi.net> | 2019-04-16 00:24:30 +0200 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2019-04-16 00:24:30 +0200 |
commit | 1aa24ed8d2974cda98733f74b36844b02942cc11 (patch) | |
tree | da122008ee7562236cce6dcac28a4277f596efb5 /application/LinkDB.php | |
parent | af22c1ae3adb7a0705814bb7c4d75c9e2aa26a0e (diff) | |
parent | 1e77e0448bbd25675d8c0fe4a73206ad9048904b (diff) | |
download | Shaarli-1aa24ed8d2974cda98733f74b36844b02942cc11.tar.gz Shaarli-1aa24ed8d2974cda98733f74b36844b02942cc11.tar.zst Shaarli-1aa24ed8d2974cda98733f74b36844b02942cc11.zip |
Merge tag 'v0.10.4' into latest
Release v0.10.4
Diffstat (limited to 'application/LinkDB.php')
-rw-r--r-- | application/LinkDB.php | 6 |
1 files changed, 5 insertions, 1 deletions
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 | |||
259 | ), | 259 | ), |
260 | 'private'=>0, | 260 | 'private'=>0, |
261 | 'created'=> new DateTime(), | 261 | 'created'=> new DateTime(), |
262 | 'tags'=>'opensource software' | 262 | 'tags'=>'opensource software', |
263 | 'sticky' => false, | ||
263 | ); | 264 | ); |
264 | $link['shorturl'] = link_small_hash($link['created'], $link['id']); | 265 | $link['shorturl'] = link_small_hash($link['created'], $link['id']); |
265 | $this->links[1] = $link; | 266 | $this->links[1] = $link; |
@@ -272,6 +273,7 @@ You use the community supported version of the original Shaarli project, by Seba | |||
272 | 'private'=>1, | 273 | 'private'=>1, |
273 | 'created'=> new DateTime('1 minute ago'), | 274 | 'created'=> new DateTime('1 minute ago'), |
274 | 'tags'=>'secretstuff', | 275 | 'tags'=>'secretstuff', |
276 | 'sticky' => false, | ||
275 | ); | 277 | ); |
276 | $link['shorturl'] = link_small_hash($link['created'], $link['id']); | 278 | $link['shorturl'] = link_small_hash($link['created'], $link['id']); |
277 | $this->links[0] = $link; | 279 | $this->links[0] = $link; |
@@ -323,6 +325,8 @@ You use the community supported version of the original Shaarli project, by Seba | |||
323 | $link['real_url'] = $link['url']; | 325 | $link['real_url'] = $link['url']; |
324 | } | 326 | } |
325 | 327 | ||
328 | $link['sticky'] = isset($link['sticky']) ? $link['sticky'] : false; | ||
329 | |||
326 | // To be able to load links before running the update, and prepare the update | 330 | // To be able to load links before running the update, and prepare the update |
327 | if (! isset($link['created'])) { | 331 | if (! isset($link['created'])) { |
328 | $link['id'] = $link['linkdate']; | 332 | $link['id'] = $link['linkdate']; |