1 files changed, 8 insertions, 8 deletions

diff --git a/frontend/include/header.php b/frontend/include/header.php
index c11c480..6e57d43 100644
--- a/frontend/include/header.php
+++ b/frontend/include/header.php
@@ -9,11 +9,11 @@ echo xmlheader();
 <link rel="shortcut icon" href="<?php echo url('images/favicon.ico'); ?>" />
 <link rel="icon" href="<?php echo url('images/favicon.png'); ?>" type="image/gif" />
 <title><?php
-echo ($S['title'] != null?$S['title'].' | ':'').$conf['title'];
+echo ($S['title'] != null?$S['title'].' | ':'').$S['conf']['title'];
 ?></title>
 <?php
 $scripts=array('GetXmlHttpObject', 'url', 'ajax');
-if ($conf['debug']) {
+if ($S['conf']['debug']) {
 	array_unshift($scripts, 'debug');
 }
 foreach (array_merge($S['scripts'], $scripts) as $script) {
@@ -40,9 +40,9 @@ echo '<li><a href="'.url('create').'">New configuration</a></li>';
 echo '<li><a href="'.url('configurations').'">My configurations</a></li>';
 echo '<li><a href="'.url('builds').'">My builds</a></li>';
 if (isset($S['user'])) {
-	if ($conf['invite'] && ($S['user']->has_flag('a') || $conf['invite'] != 'admin'))
+	if ($S['conf']['invite'] && ($S['user']->has_flag('a') || $S['conf']['invite'] != 'admin'))
 		echo '<li><a href="'.url('invite').'">Invite</a></li>';
-} elseif ($conf['registration'])
+} elseif ($S['conf']['registration'])
 	echo '<li><a href="'.url('register').'">Register</a>';
 ?>
 </ul>
@@ -54,7 +54,7 @@ if (isset($S['user'])) {
 		$links['logout'.(strlen($S['request'])?'/'.$S['request']:'')]='Logout';
 	} else {
 		$links['login'.(strlen($S['request'])?'/'.$S['request']:'')]='Login';
-		if ($conf['registration']) $links['register']='Register';
+		if ($S['conf']['registration']) $links['register']='Register';
 	}
 	foreach ($links as $url => $text) {
 		$links[$url]='<a href="'.url($url).'">'.htmlentities($text).'</a>';
@@ -64,8 +64,8 @@ if (isset($S['user'])) {
 </div>
 <div id="main" class="box">
 <?php
-	if (isset($death)) {
-		echo $death;
-		$death='';
+	if (isset($S['death'])) {
+		echo $S['death'];
+		$S['death']='';
 	}
 ?>