From: Massimiliano Torromeo <massimilianotorromeo@artera.it>
Date: Tue, 15 Nov 2016 13:54:01 +0000 (+0100)
Subject: Fixed mssql driver for usage with microsoft's php7 sqlsrv extension
X-Git-Tag: v4.3.0~69
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=d0268c69da17281035d992fd3d53fb122a5a89f3;p=adminer.git

Fixed mssql driver for usage with microsoft's php7 sqlsrv extension
---

diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php
index 790ac3f3..2535c8bf 100644
--- a/adminer/drivers/mssql.inc.php
+++ b/adminer/drivers/mssql.inc.php
@@ -109,11 +109,11 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function fetch_assoc() {
-				return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_ASSOC, SQLSRV_SCROLL_NEXT));
+				return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_ASSOC));
 			}
 
 			function fetch_row() {
-				return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_NUMERIC, SQLSRV_SCROLL_NEXT));
+				return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_NUMERIC));
 			}
 
 			function fetch_field() {
@@ -288,7 +288,7 @@ if (isset($_GET["mssql"])) {
 	}
 
 	function get_databases() {
-		return get_vals("EXEC sp_databases");
+		return get_vals("SELECT name FROM sys.databases WHERE name NOT IN ('master', 'tempdb', 'model', 'msdb')");
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {