Changed Kohana_Core extensions to actual files, following system changes, updated index.php and bootstrap.php

This commit is contained in:
Woody Gilk 2009-08-01 12:43:08 -05:00
parent f7d079cb8d
commit 3e619c227d
2 changed files with 12 additions and 11 deletions

View file

@ -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.

View file

@ -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;