diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-05-03 19:41:04 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-05-03 19:41:04 +0200 |
| commit | ad93eaaaf36c80dcfd39584894c2c5c8d0f5c4fc (patch) | |
| tree | 672a19020f6738b331552e1b93a131d356b04539 | |
| parent | 38ba3dcdd97ad71ee85037e569f012e219d90716 (diff) | |
| parent | 11d097fc1a1bc2e539922cfa5d078bbcb74d4da8 (diff) | |
| download | forums-ad93eaaaf36c80dcfd39584894c2c5c8d0f5c4fc.tar forums-ad93eaaaf36c80dcfd39584894c2c5c8d0f5c4fc.tar.gz forums-ad93eaaaf36c80dcfd39584894c2c5c8d0f5c4fc.tar.bz2 forums-ad93eaaaf36c80dcfd39584894c2c5c8d0f5c4fc.tar.xz forums-ad93eaaaf36c80dcfd39584894c2c5c8d0f5c4fc.zip | |
Merge branch 'ticket/cs278/9582' into develop-olympus
* ticket/cs278/9582:
[ticket/9582] MSSQL native backups can now be restored.
[ticket/9582] Advanced search cannot be accessed using MSSQL native.
[ticket/9582] Removing a report reason leaves reports with an unknown reason under MSSQL native.
[ticket/9582] Unable to edit CPFs from UCP under MSSQL native driver.
[ticket/9582] Custom profile fields cannot be created under MSSQL native.
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_profile.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_reasons.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_profile_fields.php | 1 | ||||
| -rw-r--r-- | phpBB/search.php | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index abfad2b90b..0582d6204e 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -394,6 +394,7 @@ class acp_database case 'mssql': case 'mssql_odbc': + case 'mssqlnative': while (($sql = $fgetd($fp, "GO\n", $read, $seek, $eof)) !== false) { $db->sql_query($sql); diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index fc08c7e8e8..2288a0728b 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -1480,6 +1480,7 @@ class acp_profile case 'mssql': case 'mssql_odbc': + case 'mssqlnative': // We are defining the biggest common value, because of the possibility to edit the min/max values of each field. $sql = 'ALTER TABLE [' . PROFILE_FIELDS_DATA_TABLE . "] ADD [$field_ident] "; diff --git a/phpBB/includes/acp/acp_reasons.php b/phpBB/includes/acp/acp_reasons.php index 8d7bc88769..dbc9fcb6cc 100644 --- a/phpBB/includes/acp/acp_reasons.php +++ b/phpBB/includes/acp/acp_reasons.php @@ -233,6 +233,7 @@ class acp_reasons // Standard? What's that? case 'mssql': case 'mssql_odbc': + case 'mssqlnative': // Change the reports using this reason to 'other' $sql = "DECLARE @ptrval binary(16) diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php index 61e3587158..fa1cc98e10 100644 --- a/phpBB/includes/functions_profile_fields.php +++ b/phpBB/includes/functions_profile_fields.php @@ -366,6 +366,7 @@ class custom_profile case 'sqlite': case 'mssql': case 'mssql_odbc': + case 'mssqlnative': $right_delim = ']'; $left_delim = '['; break; diff --git a/phpBB/search.php b/phpBB/search.php index ab2221a96e..7a9ab82f93 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -1155,6 +1155,7 @@ if ($auth->acl_get('a_search')) case 'mssql': case 'mssql_odbc': + case 'mssqlnative': $sql = 'SELECT search_time, search_keywords FROM ' . SEARCH_RESULTS_TABLE . ' WHERE DATALENGTH(search_keywords) > 0 |