# HG changeset patch
# User Tom Fredrik "BFG" Klaussen <bfg@blenning.no>
# Date 1349992032 -7200
# Node ID 7bc88fe62101119e9c0dcb74bda2c133e5973227
# Parent  218a58bb2f347ec3090a69e6e482c691b31e54ec# Parent  62b9d7a35658a272271cb825b11aa6df60392881
Branch merge.

diff -r 62b9d7a35658 -r 7bc88fe62101 index.php
--- a/index.php	Thu Oct 11 23:41:13 2012 +0200
+++ b/index.php	Thu Oct 11 23:47:12 2012 +0200
@@ -5,27 +5,26 @@
  */
 include_once 'constants.inc';
 
-$cacheable = true;
-
 include_once 'CacheTimeCheck.inc';
 
+/// @cond
 $baseDir = dirname(__FILE__);
+$scriptCache = ScriptIncludeCache::instance(__FILE__);
 
-$cache = ScriptIncludeCache::instance(__FILE__);
-$cache->includeOnce('Language.inc', $baseDir);
-$cache->includeOnce('Options.inc', $baseDir);
-$cache->includeOnce('common-functions.inc', $baseDir);
-$cache->includeOnce('filters.inc', $baseDir);
-$cache->includeOnce('InputParser.inc', $baseDir);
-$cache->includeOnce('Logger.inc', $baseDir);
+$scriptCache->includeOnce('Language.inc', $baseDir);
+$scriptCache->includeOnce('Options.inc', $baseDir);
+$scriptCache->includeOnce('common-functions.inc', $baseDir);
+$scriptCache->includeOnce('filters.inc', $baseDir);
+$scriptCache->includeOnce('InputParser.inc', $baseDir);
+$scriptCache->includeOnce('Logger.inc', $baseDir);
 
 if (DEBUG_LEVEL >= VERBOSITY_DEBUG) {
   var_dump($_SERVER);
 }
 
-$masterName = basePath() . "/master.xml";
-
-$input = new InputParser($masterName, $cache);
+$input = new InputParser(basePath() . "/master.xml", $cache);
 
 $input->genPage();
+/// @endcond
+
 ?>
\ No newline at end of file