oreolek/batufa
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move old base.php functionality to index.php and bootstrap.php. Fixes #3249.

Browse source
This commit is contained in:
Jeremy Bush 2010-10-26 18:58:38 -05:00
parent 7b93f41496
commit c36a59a97f
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
application/bootstrap.php
View file

@ -36,6 +36,11 @@ ini_set('unserialize_callback_func', 'spl_autoload_call');
//-- Configuration and initialization -----------------------------------------
/**
* Set the default language
*/
I18n::lang('en-us');
/**
* Set Kohana::$environment if $_ENV['KOHANA_ENV'] has been supplied.
*

17
index.php
View file

@ -82,8 +82,21 @@ if (file_exists('install'.EXT))
return include 'install'.EXT;
}
// Load the base, low-level functions
require SYSPATH.'base'.EXT;
if ( ! defined('KOHANA_START_TIME'))
{
/**
* Define the start time of the application, used for profiling.
*/
define('KOHANA_START_TIME', microtime(TRUE));
}
if ( ! defined('KOHANA_START_MEMORY'))
{
/**
* Define the memory usage at the start of the application, used for profiling.
*/
define('KOHANA_START_MEMORY', memory_get_usage());
}
// Load the core Kohana class
require SYSPATH.'classes/kohana/core'.EXT;