Updating submodules & fixing bootstrap for 3.1.x changes
This commit is contained in:
parent
0cc94b5323
commit
9bb677ac91
|
@ -62,6 +62,11 @@ Kohana::init(array(
|
||||||
'base_url' => '/',
|
'base_url' => '/',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the language to be used for translations
|
||||||
|
*/
|
||||||
|
I18n::lang('en_US');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Attach the file write to logging. Multiple writers are supported.
|
* Attach the file write to logging. Multiple writers are supported.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -76,9 +76,6 @@ define('SYSPATH', realpath($system).DIRECTORY_SEPARATOR);
|
||||||
// Clean up the configuration vars
|
// Clean up the configuration vars
|
||||||
unset($application, $modules, $system);
|
unset($application, $modules, $system);
|
||||||
|
|
||||||
// Load the base, low-level functions
|
|
||||||
require SYSPATH.'base'.EXT;
|
|
||||||
|
|
||||||
// Load the core Kohana class
|
// Load the core Kohana class
|
||||||
require SYSPATH.'classes/kohana/core'.EXT;
|
require SYSPATH.'classes/kohana/core'.EXT;
|
||||||
|
|
||||||
|
@ -146,6 +143,8 @@ Kohana::init(array(
|
||||||
'base_url' => '/',
|
'base_url' => '/',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
I18n::lang('en-US');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Attach the file write to logging. Multiple writers are supported.
|
* Attach the file write to logging. Multiple writers are supported.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 343269f46d5649194b24e847ea67840962b70983
|
Subproject commit 5901adbc0f54f3db59245979b96848fb9ce2df98
|
|
@ -1 +1 @@
|
||||||
Subproject commit 5314dea8a30b0376f676b2d936930a107083f08b
|
Subproject commit 1a6328d198aea8b3205cf71251ece78b97746b12
|
|
@ -1 +1 @@
|
||||||
Subproject commit bfde61be4b8ba027b0cc9ce1551c0fb027b499a0
|
Subproject commit 35c99ddec1e572594f7d4ab593614891d84b64c0
|
|
@ -1 +1 @@
|
||||||
Subproject commit 7ec890483ed1dc5e73f2845e31bf127dd4e2dea6
|
Subproject commit 79b6626356c6bf08ee21900254e189fcb13e3ffe
|
|
@ -1 +1 @@
|
||||||
Subproject commit 836e8b3a8ee89fb6445b503fe46400f40941e5f6
|
Subproject commit db93048c87f5c1e9eaf471d13a3ac4655cc335d7
|
|
@ -1 +1 @@
|
||||||
Subproject commit c8ea9a7e517301e48cb113acf038fcd1a110e0ab
|
Subproject commit a09e8d3e90603a03e27e963740a6d277b351de5e
|
2
system
2
system
|
@ -1 +1 @@
|
||||||
Subproject commit 2a708c8446313038012f300e2f6e3d29e840ac4c
|
Subproject commit eadc70ecd68592246e1de6d39961a7568a55042e
|
Loading…
Reference in a new issue