Make optional the database charset setting

utopiabound · Dec 7, 2015 · 4ddbaba · 4ddbaba
1 parent b5c19cd
commit 4ddbaba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/include/local.config.php.dist b/include/local.config.php.dist
@@ -5,7 +5,7 @@ $CONFIG_VARS['db_server'] = array(
 			'dbname'=>'opendb',		//OpenDb database name
 			'username'=>'lender',	//OpenDb database user name
 			'passwd'=>'test',		//OpenDb user password
-			'charset'=>'utf8',	    //Database charset
+			//'charset'=>'utf8',	    //Database charset (OPTIONAL)
 			'table_prefix'=>NULL, 	//'opendb_';//Specify a table prefix.  Include the '_' as well!
 			'debug-sql'=>FALSE);	//Specify whether all SQL statements should be displayed in the page.
 

diff --git a/lib/database/mysql.inc.php b/lib/database/mysql.inc.php
@@ -33,7 +33,7 @@
     
     @param $cache_link - if TRUE, save reference to link for reuse.
  */
-function db_connect($host, $user, $passwd, $dbname, $charset, $cache_link = TRUE) {
+function db_connect($host, $user, $passwd, $dbname, $charset = NULL, $cache_link = TRUE) {
 	global $_opendb_dblink;
 
 	$link = @mysql_connect($host, $user, $passwd);
@@ -42,8 +42,7 @@ function db_connect($host, $user, $passwd, $dbname, $charset, $cache_link = TRUE
 			if ($cache_link) {
 				$_opendb_dblink = $link;
 			}
-			@mysql_query("SET NAMES '.$charset.'");
-			echo "HOLA";
+			if ($charset!=NULL) @mysql_query("SET NAMES '.$charset.'");
 			return $link;
 		}
 	}

diff --git a/lib/database/mysqli.inc.php b/lib/database/mysqli.inc.php
@@ -35,7 +35,7 @@
     
     @param $cache_link - if TRUE, save reference to link for reuse.
  */
-function db_connect($host, $user, $passwd, $dbname, $charset, $cache_link = TRUE) {
+function db_connect($host, $user, $passwd, $dbname, $charset = NULL, $cache_link = TRUE) {
 	global $_opendb_dblink;
 
 	$index = strpos($host, ':');
@@ -64,7 +64,7 @@ function db_connect($host, $user, $passwd, $dbname, $charset, $cache_link = TRUE
 			$_opendb_dblink = $link;
 		}
 
-		@mysqli_set_charset($link, $charset);
+		if ($charset!=NULL) @mysqli_set_charset($link, $charset);	
 
 		return $link;
 	}