Making sure that tokens and survey tables are created with the right …

…collation git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/stable_plus@3415 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 18, 2007 · 169c131 · 169c131
1 parent 58e2934
commit 169c131
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/admin/activate.php b/admin/activate.php
@@ -415,7 +415,7 @@
 	$createsurvey = rtrim($createsurvey, ",\n")."\n"; // Does nothing if not ending with a coma
 	$tabname = "{$dbprefix}survey_{$_GET['sid']}"; # not using db_table_name as it quotes the table name (as does CreateTableSQL)
 
-	$taboptarray = array('mysql' => 'TYPE='.$databasetabletype.'  CHARACTER SET utf8');
+	$taboptarray = array('mysql' => 'TYPE='.$databasetabletype.'  CHARACTER SET utf8 COLLATE utf8_unicode_ci');
 	$dict = NewDataDictionary($connect);
 	$sqlarray = $dict->CreateTableSQL($tabname, $createsurvey, $taboptarray);
 

diff --git a/admin/tokens.php b/admin/tokens.php
@@ -163,7 +163,7 @@
 
 
 		$tabname = "{$dbprefix}tokens_{$surveyid}"; # not using db_table_name as it quotes the table name (as does CreateTableSQL)
-		$taboptarray = array('mysql' => 'TYPE='.$databasetabletype);
+        $taboptarray = array('mysql' => 'TYPE='.$databasetabletype.'  CHARACTER SET utf8 COLLATE utf8_unicode_ci');
 		$dict = NewDataDictionary($connect);
 		$sqlarray = $dict->CreateTableSQL($tabname, $createtokentable, $taboptarray);
 		$execresult=$dict->ExecuteSQLArray($sqlarray, false);