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

5 files changed, 4 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fcedbc3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/motdLockFile
diff --git a/globe.php b/globe.php
index cd3425c..526d306 100644
--- a/globe.php
+++ b/globe.php
@@ -4,15 +4,7 @@ if (!session_id())
 	session_start();

 //session_regenerate_id();

 

-//Database login:

-//include_once 'sqlEmbedded.php';

-

-//!! CONFIRM THIS DOMAIN BEFORE TRANSFER

-//$mydomain = "http://www.mazetd.4xg.net/";

-//$mydomain = "http://www.blue.4xg.net/

-//$mydomain = "http://www.pathery.com/";

-$mydomain = "http://beta.snapems.com/";

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

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

 

 function LogError($error) {

 	

diff --git a/images/Mute.png b/images/Mute.png
index 8210033..27f9ded 100644
--- a/images/Mute.png
+++ b/images/Mute.png
diff --git a/images/Sound.png b/images/Sound.png
index f2a51fa..15666f5 100644
--- a/images/Sound.png
+++ b/images/Sound.png
diff --git a/includes/header.php b/includes/header.php
index 15129c4..7085aea 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -18,6 +18,8 @@ function htmlHeader($css = array(), $title = 'Pathery', $desc = '', $scripts = a
 	}

 ?>

 	<link rel="image_src" type="image/png" href="/images/linkdsp.png" />

+	<link rel="icon" href="/favicon.ico" type="image/x-icon"/>

+	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"/>

 <?php

 	foreach ($css as $c) {

 		echo "	<link href=\"css/$c.css?v=$resourceVer.css\" rel=\"stylesheet\" type=\"text/css\" />\n";