Changed Kohana_Core extensions to actual files, following system changes, updated index.php and bootstrap.php
This commit is contained in:
parent
f7d079cb8d
commit
3e619c227d
|
@ -1,14 +1,5 @@
|
||||||
<?php defined('SYSPATH') or die('No direct script access.');
|
<?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 --------------------------------------------------------
|
//-- Environment setup --------------------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -42,7 +33,7 @@ spl_autoload_register(array('Kohana', 'auto_load'));
|
||||||
* - boolean profile enable or disable internal profiling TRUE
|
* - boolean profile enable or disable internal profiling TRUE
|
||||||
* - boolean caching enable or disable internal caching FALSE
|
* - 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.
|
* Attach the file write to logging. Multiple writers are supported.
|
||||||
|
|
12
index.php
12
index.php
|
@ -86,7 +86,17 @@ define('KOHANA_START_TIME', microtime(TRUE));
|
||||||
require SYSPATH.'base'.EXT;
|
require SYSPATH.'base'.EXT;
|
||||||
|
|
||||||
// Load the main Kohana class
|
// 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
|
// Bootstrap the application
|
||||||
require APPPATH.'bootstrap'.EXT;
|
require APPPATH.'bootstrap'.EXT;
|
||||||
|
|
Loading…
Reference in a new issue