mirror of
https://github.com/cytopia/devilbox.git
synced 2024-12-19 21:07:53 +00:00
Fix phpPgAdmin for PHP 8.0 and PHP 8.1
This commit is contained in:
parent
20931a7d97
commit
2dfb908fbf
@ -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)
|
||||
// -- Freek Dijkstra
|
||||
|
||||
function ADODB_postgres64()
|
||||
function __construct()
|
||||
{
|
||||
// changes the metaColumnsSQL, adds columns: attnum[6]
|
||||
}
|
||||
|
@ -22,9 +22,9 @@ class ADODB_postgres7 extends ADODB_postgres64 {
|
||||
var $ansiOuter = true;
|
||||
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) {
|
||||
$this->rsPrefix .= 'assoc_';
|
||||
}
|
||||
|
@ -13,7 +13,7 @@ DVLBOX_PATH="$( cd "${SCRIPT_PATH}/../.." && pwd -P )"
|
||||
. "${SCRIPT_PATH}/../scripts/.lib.sh"
|
||||
|
||||
RETRIES=10
|
||||
DISABLED_VERSIONS=("8.0" "8.1")
|
||||
DISABLED_VERSIONS=()
|
||||
|
||||
|
||||
echo
|
||||
|
@ -230,6 +230,20 @@ phpPgAdmin requires some adjustments to work with the Devilbox intranet. See bel
|
||||
+ 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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user