Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bugfix: do not store plugin errors in data.php

Browse source 
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.
This commit is contained in:
ArthurHoaro 2015-11-22 14:45:09 +01:00
parent a5dd1772bd
commit e4b9a7633d
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
index.php
View file

@ -679,8 +679,8 @@ private function initialize()
$this->tpl->assign('pagetitle', $GLOBALS['pagetitle']); $this->tpl->assign('pagetitle', $GLOBALS['pagetitle']);
} }
$this->tpl->assign('shaarlititle', empty($GLOBALS['title']) ? 'Shaarli': $GLOBALS['title']); $this->tpl->assign('shaarlititle', empty($GLOBALS['title']) ? 'Shaarli': $GLOBALS['title']);
if (!empty($GLOBALS['plugins']['errors'])) { if (!empty($GLOBALS['plugin_errors'])) {
$this->tpl->assign('plugin_errors', $GLOBALS['plugins']['errors']); $this->tpl->assign('plugin_errors', $GLOBALS['plugin_errors']);
} }
} }

2
plugins/readityourself/readityourself.php
View file

@ -14,7 +14,7 @@
} }
if (!isset($GLOBALS['plugins']['READITYOUSELF_URL'])) { if (!isset($GLOBALS['plugins']['READITYOUSELF_URL'])) {
$GLOBALS['plugins']['errors'][] = 'Readityourself plugin error: '. $GLOBALS['plugin_errors'][] = 'Readityourself plugin error: '.
'Please define "$GLOBALS[\'plugins\'][\'READITYOUSELF_URL\']" '. 'Please define "$GLOBALS[\'plugins\'][\'READITYOUSELF_URL\']" '.
'in "plugins/readityourself/config.php" or in your Shaarli config.php file.'; 'in "plugins/readityourself/config.php" or in your Shaarli config.php file.';
} }

2
plugins/wallabag/wallabag.php
View file

@ -10,7 +10,7 @@
} }
if (!isset($GLOBALS['plugins']['WALLABAG_URL'])) { if (!isset($GLOBALS['plugins']['WALLABAG_URL'])) {
$GLOBALS['plugins']['errors'][] = 'Wallabag plugin error: '. $GLOBALS['plugin_errors'][] = 'Wallabag plugin error: '.
'Please define "$GLOBALS[\'plugins\'][\'WALLABAG_URL\']" '. 'Please define "$GLOBALS[\'plugins\'][\'WALLABAG_URL\']" '.
'in "plugins/wallabag/config.php" or in your Shaarli config.php file.'; 'in "plugins/wallabag/config.php" or in your Shaarli config.php file.';
} }