diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-31 02:08:40 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-31 02:08:40 +0200 |
| commit | ccb4182d2906b00a3fdce2790656aace5bdc2c9d (patch) | |
| tree | ef68c1331807de19796822e8cd3e66b15ddece81 /phpBB/includes | |
| parent | 4d6178884302167bc2e5868975ba2830fda20dfb (diff) | |
| parent | 47557fd4d2037915845f9fcfe863cea539eea7ac (diff) | |
| download | forums-ccb4182d2906b00a3fdce2790656aace5bdc2c9d.tar forums-ccb4182d2906b00a3fdce2790656aace5bdc2c9d.tar.gz forums-ccb4182d2906b00a3fdce2790656aace5bdc2c9d.tar.bz2 forums-ccb4182d2906b00a3fdce2790656aace5bdc2c9d.tar.xz forums-ccb4182d2906b00a3fdce2790656aace5bdc2c9d.zip | |
Merge branch 'ticket/kellanved/9521' into develop-olympus
* ticket/kellanved/9521:
[ticket/9521] Fix error reporting for the native SQL Server plugin.
Diffstat (limited to 'phpBB/includes')
| -rwxr-xr-x[-rw-r--r--] | phpBB/includes/db/mssqlnative.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php index 98e22d4412..44d5722e4f 100644..100755 --- a/phpBB/includes/db/mssqlnative.php +++ b/phpBB/includes/db/mssqlnative.php @@ -503,6 +503,7 @@ class dbal_mssqlnative extends dbal { $errors = @sqlsrv_errors(SQLSRV_ERR_ERRORS); $error_message = ''; + $code = 0; if ($errors != null) { @@ -510,6 +511,7 @@ class dbal_mssqlnative extends dbal { $error_message .= "SQLSTATE: ".$error[ 'SQLSTATE']."\n"; $error_message .= "code: ".$error[ 'code']."\n"; + $code = $error['code']; $error_message .= "message: ".$error[ 'message']."\n"; } $this->last_error_result = $error_message; @@ -519,7 +521,11 @@ class dbal_mssqlnative extends dbal { $error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array(); } - return $error; + + return array( + 'message' => $error, + 'code' => $code, + ); } /** |