From d8c670eaa621c132412a13a90d5f10663cada923 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Tue, 16 Oct 2012 23:05:11 +0100
Subject: [PATCH] move yet more stuff out of index.php

---
 core/util.inc.php | 11 +++++++++++
 index.php         |  9 ---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/util.inc.php b/core/util.inc.php
index cbcc6aac..9d3a297d 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -1,6 +1,7 @@
 <?php
 require_once "lib/recaptchalib.php";
 require_once "lib/securimage/securimage.php";
+require_once "lib/context.php";
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * Input / Output Sanitising                                                 *
@@ -1177,6 +1178,16 @@ function _sanitise_environment() {
 		error_reporting(E_ALL);
 	}
 
+	if(CONTEXT) {
+		ctx_set_log(CONTEXT);
+		ctx_log_start(@$_SERVER["REQUEST_URI"], true, true);
+	}
+
+	if(COVERAGE) {
+		_start_coverage();
+		register_shutdown_function("_end_coverage");
+	}
+
 	assert_options(ASSERT_ACTIVE, 1);
 	assert_options(ASSERT_BAIL, 1);
 
diff --git a/index.php b/index.php
index 662637a6..73b83a77 100644
--- a/index.php
+++ b/index.php
@@ -49,17 +49,8 @@ if(!file_exists("data/config/shimmie.conf.php")) {
 }
 require_once "core/sys_config.inc.php";
 require_once "core/util.inc.php";
-require_once "lib/context.php";
 
 // set up and purify the environment
-if(CONTEXT) {
-	ctx_set_log(CONTEXT);
-}
-ctx_log_start(@$_SERVER["REQUEST_URI"], true, true);
-if(COVERAGE) {
-	_start_coverage();
-	register_shutdown_function("_end_coverage");
-}
 _version_check();
 _sanitise_environment();