From d0c5eabfbc64b948a50d8784757c80d62356ffee Mon Sep 17 00:00:00 2001
From: Starla Insigna <hatkirby@fourisland.com>
Date: Fri, 15 Jan 2010 17:41:49 -0500
Subject: Removed XHTML

XHTML was causing so many problems that it was simply unbearable. Four Island 3.0 will be sure to have no traces left of this annoyance.

Also, a lot of files are showing up as being changed because this commit was on the server and I had to modifiy permissions for files (all of the files that were new since my
last server commit) so I could commit.
---
 includes/common.php | 46 ++++++++++++++++++++--------------------------
 includes/layout.php |  0
 2 files changed, 20 insertions(+), 26 deletions(-)
 mode change 100644 => 100755 includes/common.php
 mode change 100644 => 100755 includes/layout.php

(limited to 'includes')

diff --git a/includes/common.php b/includes/common.php
old mode 100644
new mode 100755
index e4321d9..1239c68
--- a/includes/common.php
+++ b/includes/common.php
@@ -22,40 +22,34 @@ if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
 
 require('headerproc.php');
 
-include('includes/template.php');
-include('includes/session.php');
-include('includes/maintenance.php');
-include('includes/parsers.php');
-include('includes/xmlrpc/xmlrpc.inc');
-include('includes/specialdates.php');
-include('includes/functions.php');
-include('includes/hits.php');
+include('includes/template.php');
+include('includes/session.php');
+include('includes/maintenance.php');
+include('includes/parsers.php');
+include('includes/xmlrpc/xmlrpc.inc');
+include('includes/specialdates.php');
+include('includes/functions.php');
+include('includes/hits.php');
 include('includes/updatePending.php');
 
-if (isset($_GET['layout']))
-{
-	if (!file_exists('theme/layouts/' . basename($_GET['layout'])))
-	{
-		$_GET['layout'] = '7';
-	}
-
+if (isset($_GET['layout']))
+{
+	if (!file_exists('theme/layouts/' . basename($_GET['layout'])))
+	{
+		$_GET['layout'] = '7';
+	}
+
 	setcookie('layout', $_GET['layout'], time()+60*60*24*30, '/', '.fourisland.com');
 
-	unset($_GET['layout']);
+	unset($_GET['layout']);
 
 	header('Location: ' . getRewriteURL());
-	exit;
+	exit;
 }
 
-if (preg_match('|MSIE ([0-9].[0-9]{1,2})|', $_SERVER['HTTP_USER_AGENT'], $matched))
-{
-	$usingIE = true;
-} else {
-	if (getLayout() == '7')
-	{
-		header('Content-type: application/xhtml+xml');
-		$xhtml = true;
-	}
+if (preg_match('|MSIE ([0-9].[0-9]{1,2})|', $_SERVER['HTTP_USER_AGENT'], $matched))
+{
+	$usingIE = true;
 }
 
 ?>
diff --git a/includes/layout.php b/includes/layout.php
old mode 100644
new mode 100755
-- 
cgit 1.4.1