2 files changed, 66 insertions, 0 deletions
diff --git a/application/Bootstrap.php b/application/Bootstrap.php
new file mode 100644
index 00000000..b15cbfce
--- /dev/null
+++ b/application/Bootstrap.php
@@ -0,0 +1,59 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+/**
+ * Kohana process control file, loaded by the front controller.
+ *
+ * $Id: Bootstrap.php 4679 2009-11-10 01:45:52Z isaiah $
+ *
+ * @package    Core
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+
+// Kohana benchmarks are prefixed to prevent collisions
+define('SYSTEM_BENCHMARK', 'system_benchmark');
+
+// Load benchmarking support
+require SYSPATH.'core/Benchmark'.EXT;
+
+// Start total_execution
+Benchmark::start(SYSTEM_BENCHMARK.'_total_execution');
+
+// Start kohana_loading
+Benchmark::start(SYSTEM_BENCHMARK.'_kohana_loading');
+
+// Load core files
+require SYSPATH.'core/Event'.EXT;
+final class Event extends Event_Core {}
+
+require SYSPATH.'core/Kohana'.EXT;
+final class Kohana extends Kohana_Core {}
+
+require SYSPATH.'core/Kohana_Exception'.EXT;
+class Kohana_Exception extends Kohana_Exception_Core {}
+
+require SYSPATH.'core/Kohana_Config'.EXT;
+require SYSPATH.'libraries/drivers/Config'.EXT;
+require SYSPATH.'libraries/drivers/Config/Array'.EXT;
+final class Kohana_Config extends Kohana_Config_Core {}
+
+// Prepare the environment
+Kohana::setup();
+
+// End kohana_loading
+Benchmark::stop(SYSTEM_BENCHMARK.'_kohana_loading');
+
+// Start system_initialization
+Benchmark::start(SYSTEM_BENCHMARK.'_system_initialization');
+
+// Prepare the system
+Event::run('system.ready');
+
+// Determine routing
+Event::run('system.routing');
+
+// End system_initialization
+Benchmark::stop(SYSTEM_BENCHMARK.'_system_initialization');
+
+// Make the magic happen!
+Event::run('system.execute');
+\ No newline at end of file
diff --git a/application/config/config.php b/application/config/config.php
index e88958ed..aecc400c 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -130,12 +130,19 @@ $config["render_stats"] = TRUE;
 $config["extension_prefix"] = "MY_";
 
 /**
+ * An optional list of Config Drivers to use, they "fallback" to the one below them if they
+ * dont work so the first driver is tried then so on until it hits the built in "array" driver and fails
+ */
+$config['config_drivers'] = array();
+
+/**
  * Additional resource paths, or "modules". Each path can either be absolute
  * or relative to the docroot. Modules can include any resource that can exist
  * in your application directory, configuration files, controllers, views, etc.
  */
 $config["modules"] = array(
   MODPATH . "forge",
+  MODPATH . "kohana23_compat",
   MODPATH . "gallery",  // gallery must be *last* in the order
 );