From 3e619c227dac06187ca4b22ae36575b80ec02ed9 Mon Sep 17 00:00:00 2001
From: Woody Gilk <woody.gilk@kohanaphp.com>
Date: Sat, 1 Aug 2009 12:43:08 -0500
Subject: [PATCH] Changed Kohana_Core extensions to actual files, following
 system changes, updated index.php and bootstrap.php

---
 application/bootstrap.php | 11 +----------
 index.php                 | 12 +++++++++++-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/application/bootstrap.php b/application/bootstrap.php
index 6e4eb13..8b05c4b 100644
--- a/application/bootstrap.php
+++ b/application/bootstrap.php
@@ -1,14 +1,5 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 
-//-- Extend Kohana class ------------------------------------------------------
-
-/**
- * You can extend the Kohana class here or include file that extends it here.
- * 
- * @see  http://docs.kohanaphp.com/extensions/core
- */
-final class Kohana extends Kohana_Core {}
-
 //-- Environment setup --------------------------------------------------------
 
 /**
@@ -42,7 +33,7 @@ spl_autoload_register(array('Kohana', 'auto_load'));
  * - boolean  profile     enable or disable internal profiling               TRUE
  * - boolean  caching     enable or disable internal caching                 FALSE
  */
-Kohana::init(array('base_url' => '/ko3/'));
+Kohana::init(array('base_url' => '/kohana/'));
 
 /**
  * Attach the file write to logging. Multiple writers are supported.
diff --git a/index.php b/index.php
index 807038b..e5abcbf 100644
--- a/index.php
+++ b/index.php
@@ -86,7 +86,17 @@ define('KOHANA_START_TIME', microtime(TRUE));
 require SYSPATH.'base'.EXT;
 
 // Load the main Kohana class
-require SYSPATH.'classes/kohana'.EXT;
+require SYSPATH.'classes/kohana/core'.EXT;
+
+if (is_file(APPPATH.'classes/kohana'.EXT))
+{
+	// Load the Kohana class extension
+	require APPPATH.'classes/kohana'.EXT;
+}
+else
+{
+	require SYSPATH.'classes/kohana'.EXT;
+}
 
 // Bootstrap the application
 require APPPATH.'bootstrap'.EXT;