Merge branch 'staging'

Conflicts:
	css/mapstyle.css
	globe.php

Signed-off-by: Patrick Davison <snapwilliam@gmail.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/includes/db.inc.php b/includes/db.inc.php
index 8e9bdfb..9287ed2 100644
--- a/includes/db.inc.php
+++ b/includes/db.inc.php
@@ -1,10 +1,11 @@
 <?php

 

+

 global $mysqlid;

-$db_host = "db2838.perfora.net";

-$db_user = "dbo358894438";

-$db_name = "db358894438";

-$db_pass = "MAZE4US";

+$db_host = "db2894.perfora.net";

+$db_user = "dbo362854667";

+$db_name = "db362854667";

+$db_pass = "mazes4me";

 $mysqlid = @mysql_connect($db_host,$db_user, $db_pass) or die("Cannot connect to database.");

 @mysql_select_db($db_name, $mysqlid) or die("Invalid database.");