]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge pull request #1271 from ArthurHoaro/hotfix/thumb-note-retrieve
authorArthurHoaro <arthur@hoa.ro>
Sat, 2 Mar 2019 09:54:06 +0000 (10:54 +0100)
committerGitHub <noreply@github.com>
Sat, 2 Mar 2019 09:54:06 +0000 (10:54 +0100)
Do not try to retrieve thumbnails for internal link

1  2 
application/bookmark/LinkUtils.php
application/feed/FeedBuilder.php
index.php
tests/bookmark/LinkUtilsTest.php

Simple merge
Simple merge
diff --cc index.php
index 3700504b8a9e86422b1570a315b76c207daa35b8,7b54f98f5299bd37a3b780ec429aa1158f1815f8..a43063b041a43ea2e323782ca798a6977a558e9a
+++ b/index.php
@@@ -354,9 -356,13 +354,9 @@@ function showDailyRSS($conf, $loginMana
  
          // We pre-format some fields for proper output.
          foreach ($links as &$link) {
 -            $link['formatedDescription'] = format_description(
 -                $link['description'],
 -                $conf->get('redirector.url'),
 -                $conf->get('redirector.encode_url')
 -            );
 +            $link['formatedDescription'] = format_description($link['description']);
              $link['timestamp'] = $link['created']->getTimestamp();
-             if (startsWith($link['url'], '?')) {
+             if (is_note($link['url'])) {
                  $link['url'] = index_url($_SERVER) . $link['url'];  // make permalink URL absolute
              }
          }
Simple merge