Merge pull request #1361 from Lucas-C/patch-1

Add pelican shaarli_poster plugin to list of integrations

diff --git a/application/feed/FeedBuilder.php b/application/feed/FeedBuilder.php
index 7c859474de414773052c0c5e79dd1583dfcd046f..957c827339515af83acddcb1245d258b59dad9b0 100644 (file)
--- a/application/feed/FeedBuilder.php
+++ b/application/feed/FeedBuilder.php
@@ -157,7 +157,7 @@ class FeedBuilder
             $permalink = '<a href="' . $link['guid'] . '" title="' . t('Permalink') . '">' . t('Permalink') . '</a>';
         }
         $link['description'] = format_description($link['description'], $pageaddr);
-        $link['description'] .= PHP_EOL . '<br>&#8212; ' . $permalink;
+        $link['description'] .= PHP_EOL . PHP_EOL . '<br>&#8212; ' . $permalink;
 
         $pubDate = $link['created'];
         $link['pub_iso_date'] = $this->getIsoDate($pubDate);

diff --git a/tpl/default/includes.html b/tpl/default/includes.html
index 6c30d1bf8a432052df87b14709249e62e786ef51..d3d3c86fd713732389b7b61d34e86b3f52048794 100644 (file)
--- a/tpl/default/includes.html
+++ b/tpl/default/includes.html
@@ -22,7 +22,7 @@
   <meta property="og:url" content="{$index_url}?{$link.shorturl}" />
   {$ogDescription=isset($link.description_src) ? $link.description_src : $link.description}
   <meta property="og:description" content="{function="substr(strip_tags($ogDescription), 0, 300)"}" />
-  {if="$link.thumbnail"}
+  {if="!empty($link.thumbnail)"}
     <meta property="og:image" content="{$index_url}{$link.thumbnail}" />
   {/if}
   {if="!$hide_timestamps || $is_logged_in"}

diff --git a/tpl/vintage/includes.html b/tpl/vintage/includes.html
index 2efb6b1063b632a23aef1cf383d941b57916b550..0cabc985708351a04ad48af7e59107078aa80ca9 100644 (file)
--- a/tpl/vintage/includes.html
+++ b/tpl/vintage/includes.html
@@ -19,7 +19,7 @@
   <meta property="og:url" content="{$index_url}?{$link.shorturl}" />
   {$ogDescription=isset($link.description_src) ? $link.description_src : $link.description}
   <meta property="og:description" content="{function="mb_substr(strip_tags($ogDescription), 0, 300)"}" />
-  {if="$link.thumbnail"}
+  {if="!empty($link.thumbnail)"}
     <meta property="og:image" content="{$index_url}{$link.thumbnail}" />
   {/if}
   {if="!$hide_timestamps || $is_logged_in"}

diff --git a/yarn.lock b/yarn.lock
index 7e627ab1d3cee1dc940d4e75353f4414a09a783b..96f854c19da45502496763dfae89722ac9ee86d7 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -3631,9 +3631,9 @@ minizlib@^1.1.1:
     minipass "^2.2.1"
 
 mixin-deep@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
-  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"