]> git.joonet.de Git - adminer.git/commitdiff
mssql: ignore serverproperty error
authorGintautas Miselis <gintautas@miselis.lt>
Wed, 9 May 2018 13:43:01 +0000 (14:43 +0100)
committerJakub Vrana <jakub@vrana.cz>
Sat, 9 Jun 2018 10:25:24 +0000 (12:25 +0200)
This change allows connection to Sybase ASE 15

adminer/drivers/mssql.inc.php

index 11f6436b6e95903edbd15ee196a9e408e0eb56ed..a6b9e4f9552e6158298e1c7522a63c5b2507c848 100644 (file)
@@ -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();
                                }