]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Fix a warning if links sticky status isn't set 1270/head
authorArthurHoaro <arthur@hoa.ro>
Sat, 9 Feb 2019 13:04:16 +0000 (14:04 +0100)
committerArthurHoaro <arthur@hoa.ro>
Sat, 9 Feb 2019 13:04:16 +0000 (14:04 +0100)
  - 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)

application/bookmark/LinkDB.php
index.php

index c13a11417b5fb66af9a7df5597ad2f2a09298936..41d5591fe11a5dcfaf3f0ca796e9436fccf47746 100644 (file)
@@ -271,7 +271,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;
@@ -284,6 +285,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;
@@ -335,6 +337,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'];
index 633ab89e6386e90eaa02f76d5a1880cb9366dccb..1d505305ad31f1aa3ac3bd85efc6163648e41fea 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1181,6 +1181,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;