ExternalVendorCode/devilbox
1
0
Fork 0
mirror of https://github.com/cytopia/devilbox.git synced 2024-12-18 20:37:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix phpPgAdmin for PHP 8.0 and PHP 8.1

Browse Source
This commit is contained in:
cytopia 2020-11-08 14:44:21 +01:00
parent 20931a7d97
commit 2dfb908fbf
No known key found for this signature in database
GPG Key ID: 6D56EDB8695128A2
4 changed files with 297 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.devilbox/www/htdocs/vendor/phppgadmin-7.13.0/libraries/adodb/drivers/adodb-postgres64.inc.php vendored
View File

@ -117,7 +117,7 @@ WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
// to know what the concequences are. The other values are correct (wheren't in 0.94) // to know what the concequences are. The other values are correct (wheren't in 0.94)
// -- Freek Dijkstra // -- Freek Dijkstra
function ADODB_postgres64() function __construct()
{ {
// changes the metaColumnsSQL, adds columns: attnum[6] // changes the metaColumnsSQL, adds columns: attnum[6]
} }

4
.devilbox/www/htdocs/vendor/phppgadmin-7.13.0/libraries/adodb/drivers/adodb-postgres7.inc.php vendored
View File

@ -22,9 +22,9 @@ class ADODB_postgres7 extends ADODB_postgres64 {
var $ansiOuter = true; var $ansiOuter = true;
var $charSet = true; //set to true for Postgres 7 and above - PG client supports encodings var $charSet = true; //set to true for Postgres 7 and above - PG client supports encodings
function ADODB_postgres7() function __construct()
{ {
$this->ADODB_postgres64(); parent::__construct();
if (ADODB_ASSOC_CASE !== 2) { if (ADODB_ASSOC_CASE !== 2) {
$this->rsPrefix .= 'assoc_'; $this->rsPrefix .= 'assoc_';
} }

2
.tests/tests/vendor-phppgadmin.sh
View File

@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
. "${SCRIPT_PATH}/../scripts/.lib.sh" . "${SCRIPT_PATH}/../scripts/.lib.sh"
RETRIES=10 RETRIES=10
DISABLED_VERSIONS=("8.0" "8.1") DISABLED_VERSIONS=()
echo echo

14
CONTRIBUTING.md
View File

@ -230,6 +230,20 @@ phpPgAdmin requires some adjustments to work with the Devilbox intranet. See bel
+ session_start(); + session_start();
+ } + }
``` ```
`libraries/adodb/drivers/adodb-postgres64.inc.php`
```diff
- function ADODB_postgres64()
+ function __construct()
```
`libraries/adodb/drivers/adodb-postgres7.inc.php`
```diff
- function ADODB_postgres7()
+ public function __construct()
{
- $this->ADODB_postgres64();
+ parent::__construct();
```
### Tests ### Tests