From 17244cee94c89c4dcdc7fc58001790165ca2d7f1 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Wed, 19 Mar 2008 05:34:59 +0000
Subject: add the title back in to the links and be a little more violent with
 the charset setting...

---
 lib/class/dba.class.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'lib/class/dba.class.php')

diff --git a/lib/class/dba.class.php b/lib/class/dba.class.php
index 3a348a46..71e6b6c8 100644
--- a/lib/class/dba.class.php
+++ b/lib/class/dba.class.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) 2001 - 2008 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -164,6 +164,16 @@ class Dba {
 		$dbh = mysql_connect($hostname,$username,$password); 
 		if (!$dbh) { debug_event('Database','Error unable to connect to database' . mysql_error(),'1'); } 
 
+		if (function_exists('mysql_set_charset')) { 
+			$sql_charset = str_replace("-","",Config::get('site_charset'));
+			$charset = mysql_set_charset($sql_charset,$dbh); 
+		} 
+		else { 
+			$sql = "SET NAMES " . mysql_real_escape_string(str_replace("-","",Config::get('site_charset'))); 
+			$charset = mysql_query($sql,$dbh); 
+		}
+		if (!$charset) { debug_event('Database','Error unable to set connection charset, function missing or set failed','1'); }  
+
 		$select_db = mysql_select_db($database,$dbh); 
 		if (!$select_db) { debug_event('Database','Error unable to select ' . $database . ' error ' . mysql_error(),'1'); } 
 		
-- 
cgit