Merge branch 'develop'

reasoncms · Sep 30, 2015 · ed83137 · ed83137
2 parents 91b1cec + ce190a5
commit ed83137
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/carl_util/db/connectDB.php b/carl_util/db/connectDB.php
@@ -27,14 +27,9 @@
  * All parameters except for dbName are deprecated.
  *
  * @param string $dbName A database connector name - this maps to an entry in the XML file
- * @param string $dbuser Deprecated - is now ignored
- * @param string $dbpasswd Deprecated - is now ignored
- * @param string $dbhost Deprecated - is now ignored
  * @return resource database connection resource
- *
- * @todo remove the $dbuse, $dbpasswd, and $dbhost parameters entirely to remove a potential source of confusion
  */
-function connectDB($dbName, $dbuser = '', $dbpasswd = '', $dbhost='')
+function connectDB($dbName)
 {
 	$db_info = get_db_credentials( $dbName );
 	// try to connect to server
@@ -71,7 +66,8 @@ function connectDB($dbName, $dbuser = '', $dbpasswd = '', $dbhost='')
 	}
 
 	// set character set for connection to UTF-8
-	mysql_set_charset("utf8", $db);
+	if(!empty($db_info[ 'charset' ]))
+		mysql_set_charset($db_info[ 'charset' ], $db);
 
 	$GLOBALS['_current_db_connection_name'] = $dbName;
 	return $db;
@@ -152,6 +148,11 @@ function get_db_credentials( $conn_name, $lack_of_creds_is_fatal = true )
 													$reader->read();
 													if ($reader->nodeType == XMLReader::TEXT) $database['host'] = $reader->value;
 												}
+												elseif ($reader->name == 'charset')
+												{
+													$reader->read();
+													if ($reader->nodeType == XMLReader::TEXT) $database['charset'] = $reader->value;
+												}
 											}
 											if ( ($reader->nodeType == XMLReader::END_ELEMENT) && ($reader->name == 'database') ) break;
 										}

diff --git a/settings/dbs.xml b/settings/dbs.xml
@@ -7,6 +7,7 @@
 <user>reason_user</user>
 <password>some_password</password>
 <host>127.0.0.1</host>
+<charset>utf8</charset>
 </database>
 
 <database>
@@ -15,5 +16,6 @@
 <user>reason_user</user>
 <password>some_password</password>
 <host>127.0.0.1</host>
+<charset>utf8</charset>
 </database>
 </databases>
diff --git a/settings/dbs.xml.sample b/settings/dbs.xml.sample
@@ -7,6 +7,7 @@
 <user>reason_user</user>
 <password>some_password</password>
 <host>your.mysql.hostname.or.ip.address</host>
+<charset>utf8</charset>
 </database>
 
 <database>
@@ -15,5 +16,6 @@
 <user>reason_user</user>
 <password>some_password</password>
 <host>your.mysql.hostname.or.ip.address</host>
+<charset>utf8</charset>
 </database>
 </databases>