Skip to content

Commit

Permalink
Changing general application files for 3.1 update
Browse files Browse the repository at this point in the history
  • Loading branch information
zombor committed Jan 21, 2011
1 parent 926e0b8 commit 7ba69b0
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 10 deletions.
9 changes: 6 additions & 3 deletions application/bootstrap.php
Expand Up @@ -2,9 +2,6 @@

//-- Environment setup --------------------------------------------------------

// Load the base, low-level functions
require SYSPATH.'base'.EXT;

// Load the core Kohana class
require SYSPATH.'classes/kohana/core'.EXT;

Expand Down Expand Up @@ -53,6 +50,11 @@

//-- Configuration and initialization -----------------------------------------

/**
* Set the default language
*/
I18n::lang('en-us');

/**
* Initialize Kohana, setting the default options.
*
Expand All @@ -68,6 +70,7 @@
*/
Kohana::init(array(
'base_url' => '/',
'index_file' => '',
));

/**
Expand Down
2 changes: 1 addition & 1 deletion application/schema/schema.sql
Expand Up @@ -177,7 +177,7 @@ CREATE TABLE IF NOT EXISTS `users` (
--

INSERT INTO `users` (`id`, `email`, `password`, `address_id`, `first_name`, `last_name`) VALUES
(1, 'admin@example.com', 0xe153b3307b87f258d2b535f91d3966298219083009c039f4e1a4057d9a50d56c67c959f9dd6ec57103d7993d28347b299c932a6f10a77b9bae0bab3c813eeda213c6496eaa3c069b21d8c06d191868dcff563d1b66615a37d784d22c64ed89bb, NULL, 'Foo', 'Bar');
(1, 'admin@example.com', 0xf5251c27aac43208936f638a47ce0722e3dbd8463bf1b0241e0f71368015880ff263ae31b88c77ada40761535d5716fbe9f02e3d20368d49a3747dfb237d591dfd3a358c275f6bb44885f6060930b022c4751c00eb4dde268042801d0b26b172, NULL, 'Foo', 'Bar');

-- --------------------------------------------------------

Expand Down
20 changes: 18 additions & 2 deletions index.php
Expand Up @@ -76,10 +76,26 @@
// Clean up the configuration vars
unset($application, $modules, $system);

/**
* Define the start time of the application, used for profiling.
*/
if ( ! defined('KOHANA_START_TIME'))
{
define('KOHANA_START_TIME', microtime(TRUE));
}

/**
* Define the memory usage at the start of the application, used for profiling.
*/
if ( ! defined('KOHANA_START_MEMORY'))
{
define('KOHANA_START_MEMORY', memory_get_usage());
}

// Bootstrap the application
require APPPATH.'bootstrap'.EXT;

echo Request::instance()
echo Request::factory()
->execute()
->send_headers()
->response;
->body();
2 changes: 1 addition & 1 deletion modules/auto-modeler
2 changes: 1 addition & 1 deletion system
Submodule system updated 250 files

0 comments on commit 7ba69b0

Please sign in to comment.