From 0a401c7ca475c0e65bbdd9212f1b6a439239c94e Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Mon, 17 Mar 2008 05:47:07 +0000
Subject: updated sql files, tweak to the update and installers to make it more
 utf-8ish hopefully final commit before release

---
 lib/install.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'lib/install.php')

diff --git a/lib/install.php b/lib/install.php
index d901e508..838da84f 100644
--- a/lib/install.php
+++ b/lib/install.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
@@ -153,12 +153,11 @@ function install_insert_db($username,$password,$hostname,$database) {
 	} // end if we are creating a user
 
 	// Figure out which version of MySQL we're running, if possible we want to use the UTF-8 dump
-	$sql = "SELECT version()"; 
-	$db_results = @mysql_query($sql,$dbh); 
+	$sql = "SELECT VERSION()"; 
+	$db_results = mysql_query($sql,$dbh); 
 
-	$data = mysql_fetch_assoc($db_results,$dbh); 
+	$data = mysql_fetch_row($db_results); 
 	$mysql_version = substr(preg_replace("/(\d+)\.(\d+)\.(\d+).*/","$1$2$3",$data[0]),0,3);
-
 	$sql_file =  ($mysql_version < '500') ? 'sql/ampache40.sql' : 'sql/ampache.sql'; 
 
 	/* Attempt to insert database */
@@ -175,6 +174,11 @@ function install_insert_db($username,$password,$hostname,$database) {
                  } // end if
          } // end for
 
+	if ($mysql_version >= '500') { 
+		$sql = "ALTER DATABASE `" . Dba::escape($database) . "` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci";
+		$db_results = mysql_query($sql); 
+	} 
+
 	return true;
 
 } // install_insert_db
-- 
cgit