Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Changing general application files for 3.1 update

  • Loading branch information...
commit 7ba69b0d80a0fec50b2d9feceb28392ff6cef2ff 1 parent 926e0b8
@zombor zombor authored
View
9 application/bootstrap.php
@@ -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;
@@ -54,6 +51,11 @@
//-- Configuration and initialization -----------------------------------------
/**
+ * Set the default language
+ */
+I18n::lang('en-us');
+
+/**
* Initialize Kohana, setting the default options.
*
* The following options are available:
@@ -68,6 +70,7 @@
*/
Kohana::init(array(
'base_url' => '/',
+ 'index_file' => '',
));
/**
View
2  application/schema/schema.sql
@@ -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');
-- --------------------------------------------------------
View
20 index.php
@@ -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  modules/auth
@@ -1 +1 @@
-Subproject commit edc580844fbb1295f23685d55ae58e2e81c9d08f
+Subproject commit ee35422db1c17391aaedb59ccc1843adb564fbc5
2  modules/auto-modeler
@@ -1 +1 @@
-Subproject commit 0590e89ad6ccb6dac54e17f3836baf3cbfc21b5c
+Subproject commit b46579cda74d467f4f15bf9667239024f6091023
2  modules/database
@@ -1 +1 @@
-Subproject commit 3d269987bba58ce0145abdacd0454256774886b8
+Subproject commit bd29aba3dd9a7f6dbc682558f5de5911f224f72f
2  system
@@ -1 +1 @@
-Subproject commit 5deded24a5fcb358f7e84bb3156956ee0650ee4a
+Subproject commit 7a1a199e30cb5ca67318b9d513753f4b801dcb39
Please sign in to comment.
Something went wrong with that request. Please try again.