From: ArthurHoaro <arthur@hoa.ro>
Date: Sun, 6 Sep 2020 11:38:31 +0000 (+0200)
Subject: Merge pull request #1546 from immanuelfodor/patch-2
X-Git-Tag: v0.12.0-beta-1~20
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=a5dd7d58d25db7ffefc7ab1b39d99da2fe6976ac;hp=a3cb851d0cd2a2256f7951bdf49eed935d343fe7;p=github%2Fshaarli%2FShaarli.git

Merge pull request #1546 from immanuelfodor/patch-2

Fix broken css/js files on individual shaare pages
---

diff --git a/plugins/qrcode/qrcode.php b/plugins/qrcode/qrcode.php
index 3b5dae34..56ae47b3 100644
--- a/plugins/qrcode/qrcode.php
+++ b/plugins/qrcode/qrcode.php
@@ -42,7 +42,7 @@ function hook_qrcode_render_linklist($data)
 function hook_qrcode_render_footer($data)
 {
     if ($data['_PAGE_'] == TemplatePage::LINKLIST) {
-        $data['js_files'][] =  PluginManager::$PLUGINS_PATH . '/qrcode/shaarli-qrcode.js';
+        $data['js_files'][] =  ($data['_BASE_PATH_'] ?? '') . '/' . PluginManager::$PLUGINS_PATH . '/qrcode/shaarli-qrcode.js';
     }
 
     return $data;
@@ -58,7 +58,7 @@ function hook_qrcode_render_footer($data)
 function hook_qrcode_render_includes($data)
 {
     if ($data['_PAGE_'] == TemplatePage::LINKLIST) {
-        $data['css_files'][] = PluginManager::$PLUGINS_PATH . '/qrcode/qrcode.css';
+        $data['css_files'][] = ($data['_BASE_PATH_'] ?? '') . '/' . PluginManager::$PLUGINS_PATH . '/qrcode/qrcode.css';
     }
 
     return $data;