diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-10-16 13:06:06 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2020-10-16 13:06:06 +0200 |
commit | 3adbdc2a83e6b77a4ca62094c5d857524e39d211 (patch) | |
tree | 5e6dd92c7e47edeb4f2917f7718ad7ad7113e23f /application | |
parent | 7f5250421be4832b9679d8140bc4a71c8005dfa3 (diff) | |
download | Shaarli-3adbdc2a83e6b77a4ca62094c5d857524e39d211.tar.gz Shaarli-3adbdc2a83e6b77a4ca62094c5d857524e39d211.tar.zst Shaarli-3adbdc2a83e6b77a4ca62094c5d857524e39d211.zip |
Inject ROOT_PATH in plugin instead of regenerating it everywhere
Diffstat (limited to 'application')
-rw-r--r-- | application/front/controller/visitor/ShaarliVisitorController.php | 1 | ||||
-rw-r--r-- | application/plugin/PluginManager.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/application/front/controller/visitor/ShaarliVisitorController.php b/application/front/controller/visitor/ShaarliVisitorController.php index 55c075a2..54f9fe03 100644 --- a/application/front/controller/visitor/ShaarliVisitorController.php +++ b/application/front/controller/visitor/ShaarliVisitorController.php | |||
@@ -106,6 +106,7 @@ abstract class ShaarliVisitorController | |||
106 | 'target' => $template, | 106 | 'target' => $template, |
107 | 'loggedin' => $this->container->loginManager->isLoggedIn(), | 107 | 'loggedin' => $this->container->loginManager->isLoggedIn(), |
108 | 'basePath' => $this->container->basePath, | 108 | 'basePath' => $this->container->basePath, |
109 | 'rootPath' => preg_replace('#/index\.php$#', '', $this->container->basePath), | ||
109 | 'bookmarkService' => $this->container->bookmarkService | 110 | 'bookmarkService' => $this->container->bookmarkService |
110 | ]; | 111 | ]; |
111 | } | 112 | } |
diff --git a/application/plugin/PluginManager.php b/application/plugin/PluginManager.php index 1b2197c9..da66dea3 100644 --- a/application/plugin/PluginManager.php +++ b/application/plugin/PluginManager.php | |||
@@ -104,6 +104,7 @@ class PluginManager | |||
104 | 'target' => '_PAGE_', | 104 | 'target' => '_PAGE_', |
105 | 'loggedin' => '_LOGGEDIN_', | 105 | 'loggedin' => '_LOGGEDIN_', |
106 | 'basePath' => '_BASE_PATH_', | 106 | 'basePath' => '_BASE_PATH_', |
107 | 'rootPath' => '_ROOT_PATH_', | ||
107 | 'bookmarkService' => '_BOOKMARK_SERVICE_', | 108 | 'bookmarkService' => '_BOOKMARK_SERVICE_', |
108 | ]; | 109 | ]; |
109 | 110 | ||