diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-09-25 18:50:43 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-09-25 18:50:43 +0200 |
| commit | 1db998348e8850db79c4afa2d057fa31fb6bc12c (patch) | |
| tree | 5e334c1b82e8be12799b729a0234f8cc0f19bb74 /system/database/drivers/mssql | |
| parent | 4b9d8f2fa62b62616d2d1043a6faa39d40989070 (diff) | |
| parent | 4131d42c793c3db50b6184e5084332d5415c91cb (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system/database/drivers/mssql')
| -rw-r--r-- | system/database/drivers/mssql/mssql_driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index e91a817b6..234be6786 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -441,7 +441,7 @@ class CI_DB_mssql_driver extends CI_DB { $sql = trim(substr($sql, 0, strrpos($sql, $orderby))); // Get the fields to select from our subquery, so that we can avoid CI_rownum appearing in the actual results - if (count($this->qb_select) === 0) + if (count($this->qb_select) === 0 OR strpos(implode(',', $this->qb_select), '*') !== FALSE) { $select = '*'; // Inevitable } |