From d471794f72a83d67936de3c76b98c6f77a1f66e3 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 7 Nov 2020 16:57:40 +0100 Subject: [PATCH] Fix phpPgAdmin error reporting --- .../phppgadmin-7.12.1/libraries/lib.inc.php | 2 +- .../phppgadmin-7.13.0/libraries/lib.inc.php | 2 +- CONTRIBUTING.md | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.devilbox/www/htdocs/vendor/phppgadmin-7.12.1/libraries/lib.inc.php b/.devilbox/www/htdocs/vendor/phppgadmin-7.12.1/libraries/lib.inc.php index 5fb761fe..6a48f937 100644 --- a/.devilbox/www/htdocs/vendor/phppgadmin-7.12.1/libraries/lib.inc.php +++ b/.devilbox/www/htdocs/vendor/phppgadmin-7.12.1/libraries/lib.inc.php @@ -10,7 +10,7 @@ include_once('./lang/translations.php'); // Set error reporting level to max - error_reporting(E_ALL); + error_reporting(E_ERROR | E_WARNING | E_PARSE); // Application name $appName = 'phpPgAdmin'; diff --git a/.devilbox/www/htdocs/vendor/phppgadmin-7.13.0/libraries/lib.inc.php b/.devilbox/www/htdocs/vendor/phppgadmin-7.13.0/libraries/lib.inc.php index 4d9c6959..67aa20bd 100644 --- a/.devilbox/www/htdocs/vendor/phppgadmin-7.13.0/libraries/lib.inc.php +++ b/.devilbox/www/htdocs/vendor/phppgadmin-7.13.0/libraries/lib.inc.php @@ -10,7 +10,7 @@ include_once('./lang/translations.php'); // Set error reporting level to max - error_reporting(E_ALL); + error_reporting(E_ERROR | E_WARNING | E_PARSE); // Application name $appName = 'phpPgAdmin'; diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index db3f4fc7..80339bb4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -169,14 +169,17 @@ phpPgAdmin requires some adjustments to work with the Devilbox intranet. See bel ``` `libraries/lib.inc.php` ```diff -- if (!ini_get('session.auto_start')) { -- session_name('PPA_ID'); -- session_start(); -- } -+ if (!strlen(session_id()) > 0) { -+ session_name('PPA_ID'); -+ session_start(); -+ } +- error_reporting(E_ALL); ++ error_reporting(E_ERROR | E_WARNING | E_PARSE); + +- if (!ini_get('session.auto_start')) { +- session_name('PPA_ID'); +- session_start(); +- } ++ if (!strlen(session_id()) > 0) { ++ session_name('PPA_ID'); ++ session_start(); ++ } ``` ### Tests