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

Merge branch 'master' of git@github.com:kohana/kohana

Browse source
This commit is contained in:
Geert De Deckere 2010-03-30 09:03:28 +02:00
parent 2d7d5fd21d 802645d57c
commit 50cdd14771
9 changed files with 42 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.gitmodules-dev Normal file
View file

@ -0,0 +1,24 @@
[submodule "system"]
path = system
url = git@github.com:kohana/core.git
[submodule "modules/codebench"]
path = modules/codebench
url = git@github.com:kohana/codebench.git
[submodule "modules/database"]
path = modules/database
url = git@github.com:kohana/database.git
[submodule "modules/image"]
path = modules/image
url = git@github.com:kohana/image.git
[submodule "modules/orm"]
path = modules/orm
url = git@github.com:kohana/orm.git
[submodule "modules/pagination"]
path = modules/pagination
url = git@github.com:kohana/pagination.git
[submodule "modules/auth"]
path = modules/auth
url = git@github.com:kohana/auth.git
[submodule "modules/userguide"]
path = modules/userguide
url = git@github.com:kohana/userguide.git

12
application/bootstrap.php
View file

@ -5,15 +5,23 @@
/**
* Set the default time zone.
*
* @see http://docs.kohanaphp.com/features/localization#time
* @see http://docs.kohanaphp.com/about.configuration
* @see http://php.net/timezones
*/
date_default_timezone_set('America/Chicago');
/**
* Set the default locale.
*
* @see http://docs.kohanaphp.com/about.configuration
* @see http://php.net/setlocale
*/
setlocale(LC_ALL, 'en_US.utf-8');
/**
* Enable the Kohana auto-loader.
*
* @see http://docs.kohanaphp.com/features/autoloading
* @see http://docs.kohanaphp.com/about.autoloading
* @see http://php.net/spl_autoload_register
*/
spl_autoload_register(array('Kohana', 'auto_load'));

4
example.htaccess
View file

@ -11,11 +11,11 @@ RewriteBase /kohana/
</Files>
# Protect application and system files from being viewed
RewriteRule ^(?:application|modules|system)\b - [F,L]
RewriteRule ^(?:application|modules|system)\b index.php/$0 [L]
# Allow any files or directories that exist to be displayed directly
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
# Rewrite all other URLs to index.php/URL
RewriteRule .* index.php/$0 [PT]
RewriteRule .* index.php/$0 [PT]

2
modules/auth

@ -1 +1 @@
Subproject commit 7e91cb483f8fa1e220bf0f77e17be68c2552a828
Subproject commit 84f12d4afc5aced5e1910bf319c40cd5d74aee2b

2
modules/database

@ -1 +1 @@
Subproject commit 35d51f624a38cc6b56b49704f7b0e4d5d0bdf8c3
Subproject commit 756518ea3b293af5aac23548d9fbf48e19be87a3

2
modules/image

@ -1 +1 @@
Subproject commit 97e875363439b3e2ca7605c6e4e03b1dd4e456d5
Subproject commit ba7b30febf44b2345626d3ed3a9c3d11cb41011a

2
modules/orm

@ -1 +1 @@
Subproject commit 830e0ef7a7256789afa23645a50b1d84973abcda
Subproject commit e68997366359d0fb18a20954a42c724eaa7c8fe4

2
modules/userguide

@ -1 +1 @@
Subproject commit 3ca1145d05471529a84aeb1a4a5b72d22d0d3a81
Subproject commit c4d5cba6db687df7702c127d73a99af257d58659

2
system

@ -1 +1 @@
Subproject commit 950976bae1ff27e32e7778bcef984a1acef60cf2
Subproject commit 56c556391fb3ec6591f90969e39ffcfcce1056d9