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

3 files changed, 2 insertions, 8 deletions

diff --git a/includes/.gitignore b/includes/.gitignore
new file mode 100644
index 0000000..4f36fe0
--- /dev/null
+++ b/includes/.gitignore
@@ -0,0 +1 @@
+/db.inc.php
diff --git a/includes/db.inc.php b/includes/db.inc.php
deleted file mode 100644
index e1db0ee..0000000
--- a/includes/db.inc.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php

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

-$db_user = "dbo362854667";

-$db_name = "db362854667";

-$db_pass = "mazes4me";

-?>
\ No newline at end of file
diff --git a/includes/header.php b/includes/header.php
index 44d028e..cf427e4 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -20,11 +20,10 @@ function htmlHeader($css = array(), $title = 'Pathery', $desc = '', $scripts = a
 	foreach ($scripts as $s) echo "<script src='js/$s.js?v=122612'></script>";

 ?>

 	<script src="js/ajax.js" async="async"></script>

+	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>

 	<script src="js/mapspecs.js?v=122612"></script>

 	<script src="js/globe.js?v=122612"></script>

 

-	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>

-

 	<script>

 	(function(c,a){window.mixpanel=a;var b,d,h,e;b=c.createElement("script");b.type="text/javascript";b.async=!0;b.src=("https:"===c.location.protocol?"https:":"http:")+'//cdn.mxpnl.com/libs/mixpanel-2.1.min.js';d=c.getElementsByTagName("script")[0];d.parentNode.insertBefore(b,d);a._i=[];a.init=function(b,c,f){function d(a,b){var c=b.split(".");2==c.length&&(a=a[c[0]],b=c[1]);a[b]=function(){a.push([b].concat(Array.prototype.slice.call(arguments,0)))}}var g=a;"undefined"!==typeof f?

 	g=a[f]=[]:f="mixpanel";g.people=g.people||[];h="disable track track_pageview track_links track_forms register register_once unregister identify name_tag set_config people.identify people.set people.increment".split(" ");for(e=0;e<h.length;e++)d(g,h[e]);a._i.push([b,c,f])};a.__SV=1.1})(document,window.mixpanel||[]);