From: ArthurHoaro <arthur@hoa.ro>
Date: Sun, 22 Nov 2015 13:45:09 +0000 (+0100)
Subject: Bugfix: do not store plugin errors in data.php
X-Git-Tag: v0.6.1~15^2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=refs%2Fpull%2F385%2Fhead;p=github%2Fshaarli%2FShaarli.git

Bugfix: do not store plugin errors in data.php

Before this, calling writeConfig() would have write error messages in data.php, because it uses 'plugins' array which is used for plugin configuration.

Causing the message error appear everytime.
---

diff --git a/index.php b/index.php
index 872acf09..7bcd0d15 100644
--- a/index.php
+++ b/index.php
@@ -679,8 +679,8 @@ class pageBuilder
             $this->tpl->assign('pagetitle', $GLOBALS['pagetitle']);
         }
         $this->tpl->assign('shaarlititle', empty($GLOBALS['title']) ? 'Shaarli': $GLOBALS['title']);
-        if (!empty($GLOBALS['plugins']['errors'])) {
-            $this->tpl->assign('plugin_errors', $GLOBALS['plugins']['errors']);
+        if (!empty($GLOBALS['plugin_errors'])) {
+            $this->tpl->assign('plugin_errors', $GLOBALS['plugin_errors']);
         }
     }
 
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')) {
 }
 
 if (!isset($GLOBALS['plugins']['READITYOUSELF_URL'])) {
-    $GLOBALS['plugins']['errors'][] = 'Readityourself plugin error: '.
+    $GLOBALS['plugin_errors'][] = 'Readityourself plugin error: '.
         'Please define "$GLOBALS[\'plugins\'][\'READITYOUSELF_URL\']" '.
         'in "plugins/readityourself/config.php" or in your Shaarli config.php file.';
 }
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')) {
 }
 
 if (!isset($GLOBALS['plugins']['WALLABAG_URL'])) {
-    $GLOBALS['plugins']['errors'][] = 'Wallabag plugin error: '.
+    $GLOBALS['plugin_errors'][] = 'Wallabag plugin error: '.
         'Please define "$GLOBALS[\'plugins\'][\'WALLABAG_URL\']" '.
         'in "plugins/wallabag/config.php" or in your Shaarli config.php file.';
 }