diff options
author | tcitworld <tcit@tcit.fr> | 2014-06-05 16:59:39 +0200 |
---|---|---|
committer | tcitworld <tcit@tcit.fr> | 2014-06-05 16:59:39 +0200 |
commit | c93a5c137fcabcf771e7bd2d16d3b8d819de16da (patch) | |
tree | ccde49187dc34d35e5a5d8c1f172a3e0a1c9ade6 /inc/poche | |
parent | 5d198e2b988e9bc44a6ecb4394600015c003003c (diff) | |
parent | 752cd4a8ef7bbc8ebd6c481ed890e0d8e46819a8 (diff) | |
download | wallabag-c93a5c137fcabcf771e7bd2d16d3b8d819de16da.tar.gz wallabag-c93a5c137fcabcf771e7bd2d16d3b8d819de16da.tar.zst wallabag-c93a5c137fcabcf771e7bd2d16d3b8d819de16da.zip |
Merge pull request #716 from mariroz/dev
error reporting level set in E_ALL & ~E_NOTICE by default, can be overriden in config
Diffstat (limited to 'inc/poche')
-rwxr-xr-x | inc/poche/Tools.class.php | 4 | ||||
-rwxr-xr-x | inc/poche/config.inc.default.php | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 8073a3fe..1ef875c9 100755 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php | |||
@@ -18,8 +18,6 @@ class Tools | |||
18 | die(_('Oops, it seems you don\'t have PHP 5.')); | 18 | die(_('Oops, it seems you don\'t have PHP 5.')); |
19 | } | 19 | } |
20 | 20 | ||
21 | error_reporting(E_ALL); | ||
22 | |||
23 | function stripslashesDeep($value) { | 21 | function stripslashesDeep($value) { |
24 | return is_array($value) | 22 | return is_array($value) |
25 | ? array_map('stripslashesDeep', $value) | 23 | ? array_map('stripslashesDeep', $value) |
@@ -64,7 +62,7 @@ class Tools | |||
64 | if (strpos($host, ':') !== false) { | 62 | if (strpos($host, ':') !== false) { |
65 | $serverport = ''; | 63 | $serverport = ''; |
66 | } | 64 | } |
67 | 65 | ||
68 | return 'http' . ($https ? 's' : '') . '://' | 66 | return 'http' . ($https ? 's' : '') . '://' |
69 | . $host . $serverport . $scriptname; | 67 | . $host . $serverport . $scriptname; |
70 | } | 68 | } |
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index ffcd205d..95f727c6 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php | |||
@@ -30,6 +30,10 @@ | |||
30 | 30 | ||
31 | @define ('MODE_DEMO', FALSE); | 31 | @define ('MODE_DEMO', FALSE); |
32 | @define ('DEBUG_POCHE', FALSE); | 32 | @define ('DEBUG_POCHE', FALSE); |
33 | |||
34 | //default level of error reporting in application. Developers should override it in their config.inc.php: set to E_ALL. | ||
35 | @define ('ERROR_REPORTING', E_ALL & ~E_NOTICE); | ||
36 | |||
33 | @define ('DOWNLOAD_PICTURES', FALSE); # This can slow down the process of adding articles | 37 | @define ('DOWNLOAD_PICTURES', FALSE); # This can slow down the process of adding articles |
34 | @define ('REGENERATE_PICTURES_QUALITY', 75); | 38 | @define ('REGENERATE_PICTURES_QUALITY', 75); |
35 | @define ('CONVERT_LINKS_FOOTNOTES', FALSE); | 39 | @define ('CONVERT_LINKS_FOOTNOTES', FALSE); |