Fixed handling of cache keys as empty results caused cache keys to exist. :(

[core.git] / inc / includes.php

diff --git a/inc/includes.php b/inc/includes.php
index 0174a4ab86a022604aca2164f5a0d3870d596764..201f2de37082ae4dc90c7e7e12f6fd3f8231b312 100644 (file)
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -8,7 +8,7 @@
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  * @deprecated
- * @todo               We should minimize these includes
+ * @todo               Minimize these includes
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,12 +27,15 @@
 // Include the class loader function
 require(FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/loader/class_ClassLoader.php');
 
-// Shall we include additional configs where you can configure some things? Then
-// Load matching config
+/*
+ * Shall we include additional configs where you can configure some things?
+ * Then load matching config file.
+ */
 ClassLoader::getSelfInstance()->loadExtraConfigs();
 
-// Register hooks here
-require(FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/hooks.php');
+// Register auto-load function with the SPL
+// @TODO This makes the core depending on the SPL. But it should be installed anyway.
+spl_autoload_register('ClassLoader::autoLoad');
 
 // Does the user has an application specified?
 // @TODO Find a nicer OOP-ed way for this