Selaa lähdekoodia

Fixed #81, character set and collation set to utf-8 by default

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@293 a333f486-631f-4898-b8df-5754b55c2be0
romainq 15 vuotta sitten
vanhempi
commit
a720ea1959
2 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 1 1
      core/cmdbsource.class.inc.php
  2. 1 1
      core/metamodel.class.php

+ 1 - 1
core/cmdbsource.class.inc.php

@@ -98,7 +98,7 @@ class CMDBSource
 
 	public static function CreateDB($sSource)
 	{
-		self::Query("CREATE DATABASE `$sSource`");
+		self::Query("CREATE DATABASE `$sSource` CHARACTER SET utf8 COLLATE utf8_unicode_ci");
 		self::SelectDB($sSource);
 	}
 

+ 1 - 1
core/metamodel.class.php

@@ -2079,7 +2079,7 @@ abstract class MetaModel
 			if (!CMDBSource::IsTable($sTable))
 			{
 				$aErrors[$sClass][] = "table '$sTable' could not be found into the DB";
-				$aSugFix[$sClass][] = "CREATE TABLE `$sTable` (`$sKeyField` INT(11) NOT NULL $sAutoIncrement PRIMARY KEY) ENGINE = innodb";
+				$aSugFix[$sClass][] = "CREATE TABLE `$sTable` (`$sKeyField` INT(11) NOT NULL $sAutoIncrement PRIMARY KEY) ENGINE = innodb CHARACTER SET utf8 COLLATE utf8_unicode_ci";
 			}
 			// Check that the key field exists
 			//