aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authortcitworld <tcit@tcit.fr>2014-06-05 16:59:39 +0200
committertcitworld <tcit@tcit.fr>2014-06-05 16:59:39 +0200
commitc93a5c137fcabcf771e7bd2d16d3b8d819de16da (patch)
treeccde49187dc34d35e5a5d8c1f172a3e0a1c9ade6
parent5d198e2b988e9bc44a6ecb4394600015c003003c (diff)
parent752cd4a8ef7bbc8ebd6c481ed890e0d8e46819a8 (diff)
downloadwallabag-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
-rwxr-xr-xinc/3rdparty/makefulltextfeed.php2
-rwxr-xr-xinc/poche/Tools.class.php4
-rwxr-xr-xinc/poche/config.inc.default.php4
-rwxr-xr-xindex.php5
4 files changed, 11 insertions, 4 deletions
diff --git a/inc/3rdparty/makefulltextfeed.php b/inc/3rdparty/makefulltextfeed.php
index 7a56be8c..62c050ec 100755
--- a/inc/3rdparty/makefulltextfeed.php
+++ b/inc/3rdparty/makefulltextfeed.php
@@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
28// Request this file passing it a web page or feed URL in the querystring: makefulltextfeed.php?url=example.org/article 28// Request this file passing it a web page or feed URL in the querystring: makefulltextfeed.php?url=example.org/article
29// For more request parameters, see http://help.fivefilters.org/customer/portal/articles/226660-usage 29// For more request parameters, see http://help.fivefilters.org/customer/portal/articles/226660-usage
30 30
31error_reporting(E_ALL ^ E_NOTICE); 31//error_reporting(E_ALL ^ E_NOTICE);
32ini_set("display_errors", 1); 32ini_set("display_errors", 1);
33@set_time_limit(120); 33@set_time_limit(120);
34 34
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);
diff --git a/index.php b/index.php
index 472e0fab..c134b103 100755
--- a/index.php
+++ b/index.php
@@ -12,6 +12,11 @@ define ('POCHE', '1.7.0');
12require 'check_setup.php'; 12require 'check_setup.php';
13require_once 'inc/poche/global.inc.php'; 13require_once 'inc/poche/global.inc.php';
14 14
15# Set error reporting level
16if (defined('ERROR_REPORTING')) {
17 error_reporting(ERROR_REPORTING);
18}
19
15# Start session 20# Start session
16Session::$sessionName = 'poche'; 21Session::$sessionName = 'poche';
17Session::init(); 22Session::init();