From b98d0bcc55c1cf3aba6a75e572fd82cbeeca022f Mon Sep 17 00:00:00 2001 From: Gintautas Miselis Date: Wed, 9 May 2018 14:43:01 +0100 Subject: [PATCH] mssql: ignore serverproperty error This change allows connection to Sybase ASE 15 --- adminer/drivers/mssql.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php index 11f6436b..a6b9e4f9 100644 --- a/adminer/drivers/mssql.inc.php +++ b/adminer/drivers/mssql.inc.php @@ -147,8 +147,10 @@ if (isset($_GET["mssql"])) { $this->_link = @mssql_connect($server, $username, $password); if ($this->_link) { $result = $this->query("SELECT SERVERPROPERTY('ProductLevel'), SERVERPROPERTY('Edition')"); - $row = $result->fetch_row(); - $this->server_info = $this->result("sp_server_info 2", 2) . " [$row[0]] $row[1]"; + if ($result) { + $row = $result->fetch_row(); + $this->server_info = $this->result("sp_server_info 2", 2) . " [$row[0]] $row[1]"; + } } else { $this->error = mssql_get_last_message(); }