Nemcio/adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2026-02-26 16:41:29 +01:00
Code Issues Packages Projects Releases Activity

Fix compatibility with PHP 8

Browse Source
This commit is contained in:
David Grudl
2020-10-20 21:04:33 +02:00
committed by Jakub Vrana
parent 697eedc6a1
commit 50bb83dbf2
5 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
adminer/include/pdo.inc.php
View File

@@ -1,8 +1,8 @@
<?php
// PDO can be used in several database drivers
if (extension_loaded('pdo')) {
/*abstract*/ class Min_PDO extends PDO {
var $_result, $server_info, $affected_rows, $errno, $error;
/*abstract*/ class Min_PDO {
var $_result, $server_info, $affected_rows, $errno, $error, $pdo;
function __construct() {
global $adminer;
@@ -14,21 +14,21 @@ if (extension_loaded('pdo')) {
function dsn($dsn, $username, $password, $options = array()) {
try {
parent::__construct($dsn, $username, $password, $options);
$this->pdo = new PDO($dsn, $username, $password, $options);
} catch (Exception $ex) {
auth_error(h($ex->getMessage()));
}
$this->setAttribute(13, array('Min_PDOStatement')); // 13 - PDO::ATTR_STATEMENT_CLASS
$this->server_info = @$this->getAttribute(4); // 4 - PDO::ATTR_SERVER_VERSION
$this->pdo->setAttribute(13, array('Min_PDOStatement')); // 13 - PDO::ATTR_STATEMENT_CLASS
$this->server_info = @$this->pdo->getAttribute(4); // 4 - PDO::ATTR_SERVER_VERSION
}
/*abstract function select_db($database);*/
function query($query, $unbuffered = false) {
$result = parent::query($query);
$result = $this->pdo->query($query);
$this->error = "";
if (!$result) {
list(, $this->errno, $this->error) = $this->errorInfo();
list(, $this->errno, $this->error) = $this->pdo->errorInfo();
if (!$this->error) {
$this->error = lang('Unknown error.');
}