Merge branch 'HEAD' of ssh://git@git.raylu.net/pathery

Conflicts:
	css/challenge.css

1 files changed, 2 insertions, 2 deletions

diff --git a/do.php b/do.php
index bbaa665..1009a91 100644
--- a/do.php
+++ b/do.php
@@ -2,7 +2,7 @@
 session_start();

 

 include "includes/maps.php";

-include "includes/db.inc.php";

+include "includes/sqlEmbedded.php";

 include "includes/datas.php";

 

 //FirePHP stuff - TODO: Delete

@@ -373,7 +373,7 @@ die(json_encode($json));
 

 function isCurrentMap($mapID) {

 	// TODO: change methodology

-	include_once('./includes/db.inc.php');

+	include_once('./includes/sqlEmbedded.php');

 	$sql = "SELECT maps.ID

 	FROM `mapOfTheDay`

 	LEFT JOIN `maps` ON maps.ID = `mapID`