diff options
author | Arthur <arthur@hoa.ro> | 2015-11-22 17:32:17 +0100 |
---|---|---|
committer | Arthur <arthur@hoa.ro> | 2015-11-22 17:32:17 +0100 |
commit | da08b65de18aec252347f954c7560377cd8ea742 (patch) | |
tree | 40ecb3ecd7f95ad2885a215397dab4205b46b1bc | |
parent | a5dd1772bd17090e502eb8d117cf4efeed524b1e (diff) | |
parent | e4b9a7633d5eb325e2ae3a098417d5e1d5609852 (diff) | |
download | Shaarli-da08b65de18aec252347f954c7560377cd8ea742.tar.gz Shaarli-da08b65de18aec252347f954c7560377cd8ea742.tar.zst Shaarli-da08b65de18aec252347f954c7560377cd8ea742.zip |
Merge pull request #385 from ArthurHoaro/plugins-error-fix
Bugfix: do not store plugin errors in data.php
-rw-r--r-- | index.php | 4 | ||||
-rw-r--r-- | plugins/readityourself/readityourself.php | 2 | ||||
-rw-r--r-- | plugins/wallabag/wallabag.php | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -679,8 +679,8 @@ class pageBuilder | |||
679 | $this->tpl->assign('pagetitle', $GLOBALS['pagetitle']); | 679 | $this->tpl->assign('pagetitle', $GLOBALS['pagetitle']); |
680 | } | 680 | } |
681 | $this->tpl->assign('shaarlititle', empty($GLOBALS['title']) ? 'Shaarli': $GLOBALS['title']); | 681 | $this->tpl->assign('shaarlititle', empty($GLOBALS['title']) ? 'Shaarli': $GLOBALS['title']); |
682 | if (!empty($GLOBALS['plugins']['errors'])) { | 682 | if (!empty($GLOBALS['plugin_errors'])) { |
683 | $this->tpl->assign('plugin_errors', $GLOBALS['plugins']['errors']); | 683 | $this->tpl->assign('plugin_errors', $GLOBALS['plugin_errors']); |
684 | } | 684 | } |
685 | } | 685 | } |
686 | 686 | ||
diff --git a/plugins/readityourself/readityourself.php b/plugins/readityourself/readityourself.php index 68efc543..1b030bc8 100644 --- a/plugins/readityourself/readityourself.php +++ b/plugins/readityourself/readityourself.php | |||
@@ -14,7 +14,7 @@ if (is_file(PluginManager::$PLUGINS_PATH . '/readityourself/config.php')) { | |||
14 | } | 14 | } |
15 | 15 | ||
16 | if (!isset($GLOBALS['plugins']['READITYOUSELF_URL'])) { | 16 | if (!isset($GLOBALS['plugins']['READITYOUSELF_URL'])) { |
17 | $GLOBALS['plugins']['errors'][] = 'Readityourself plugin error: '. | 17 | $GLOBALS['plugin_errors'][] = 'Readityourself plugin error: '. |
18 | 'Please define "$GLOBALS[\'plugins\'][\'READITYOUSELF_URL\']" '. | 18 | 'Please define "$GLOBALS[\'plugins\'][\'READITYOUSELF_URL\']" '. |
19 | 'in "plugins/readityourself/config.php" or in your Shaarli config.php file.'; | 19 | 'in "plugins/readityourself/config.php" or in your Shaarli config.php file.'; |
20 | } | 20 | } |
diff --git a/plugins/wallabag/wallabag.php b/plugins/wallabag/wallabag.php index 024a3d2b..37969c97 100644 --- a/plugins/wallabag/wallabag.php +++ b/plugins/wallabag/wallabag.php | |||
@@ -10,7 +10,7 @@ if (is_file(PluginManager::$PLUGINS_PATH . '/wallabag/config.php')) { | |||
10 | } | 10 | } |
11 | 11 | ||
12 | if (!isset($GLOBALS['plugins']['WALLABAG_URL'])) { | 12 | if (!isset($GLOBALS['plugins']['WALLABAG_URL'])) { |
13 | $GLOBALS['plugins']['errors'][] = 'Wallabag plugin error: '. | 13 | $GLOBALS['plugin_errors'][] = 'Wallabag plugin error: '. |
14 | 'Please define "$GLOBALS[\'plugins\'][\'WALLABAG_URL\']" '. | 14 | 'Please define "$GLOBALS[\'plugins\'][\'WALLABAG_URL\']" '. |
15 | 'in "plugins/wallabag/config.php" or in your Shaarli config.php file.'; | 15 | 'in "plugins/wallabag/config.php" or in your Shaarli config.php file.'; |
16 | } | 16 | } |