From 224f9ee5014ae5c5399188afd8d38e3b620e2856 Mon Sep 17 00:00:00 2001
From: Starla Insigna <hatkirby@fourisland.com>
Date: Thu, 26 Nov 2009 14:21:20 -0500
Subject: Added Fouripedia compatibility

Made many strutural changes to Four Island allowing for the reinclusion of Fouripedia.
---
 includes/layout.php | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'includes/layout.php')

diff --git a/includes/layout.php b/includes/layout.php
index ffe1aa6..b11c56f 100644
--- a/includes/layout.php
+++ b/includes/layout.php
@@ -28,19 +28,17 @@ $template->add('CATEGORY',(isset($pageCategory)) ? $pageCategory : 'none');
 $template->add('AID',(isset($pageAID)) ? $pageAID : 'none');
 $template->add('EXTRATITLE',isset($title) ? ($title . ' - ') : '');
 $template->add(strtoupper($pageCategory) . 'ACTIVE', ' class="active"');
+$template->add('EXTRASIDEBAR', isset($extraSidebar) ? $extraSidebar : '');
 
-if (($pageCategory != 'fourm') && ($pageCategory != 'wiki'))
-{
-	$template->add('REDIRPAGE',rawurlencode($_SERVER['REQUEST_URI']));
-	$template->add('LOGDATA',echoLogData());
-	$template->add('LOWERLOGDATA','log' . strtolower(echoLogData()));
-	$template->add('SID',getSessionID());
-	$template->adds_block('MEMBERS',array('exi' => 1));
+$template->add('REDIRPAGE',rawurlencode($_SERVER['REQUEST_URI']));
+$template->add('LOGDATA',echoLogData());
+$template->add('LOWERLOGDATA','log' . strtolower(echoLogData()));
+$template->add('SID',getSessionID());
+$template->adds_block('MEMBERS',array('exi' => 1));
 
-	if (isAdmin())
-	{
-		$template->adds_block('ADMIN',array('exi' => 1));
-	}
+if (isAdmin())
+{
+	$template->adds_block('ADMIN',array('exi' => 1));
 }
 
 if (isset($hatNav) && is_array($hatNav))
@@ -274,11 +272,11 @@ foreach ($counts as $tag => $count)
 if (!isset($noRightbar))
 {
 	$template->adds_block('RIGHTBAR', array('exi'=>1));
-}
-
+}
+
 $template->add('ME', getRewriteURL());
 
-$template->add('CONTENT', stripslashes($content));
+$template->add('CONTENT', $content);
 
 $template->display();
 
-- 
cgit 1.4.1