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

Merge branch '3.1/develop' of http://github.com/kohana/kohana into 3.1/develop

Browse source
This commit is contained in:
Kiall Mac Innes 2011-02-10 20:19:06 +00:00
parent 6ec2e85553 e543b9d26c
commit 591c8cb5e9
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -1,3 +1,3 @@
# Kohana PHP Framework, version 3.1 (dev)
# Kohana PHP Framework, version 3.1 (release)
This is the current development version of [Kohana](http://kohanaframework.org/).
This is the current release version of [Kohana](http://kohanaframework.org/).

6
index.php
View file

@ -56,15 +56,15 @@ error_reporting(E_ALL | E_STRICT);
// Set the full path to the docroot
define('DOCROOT', realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR);
// Make the application relative to the docroot
// Make the application relative to the docroot, for symlink'd index.php
if ( ! is_dir($application) AND is_dir(DOCROOT.$application))
$application = DOCROOT.$application;
// Make the modules relative to the docroot
// Make the modules relative to the docroot, for symlink'd index.php
if ( ! is_dir($modules) AND is_dir(DOCROOT.$modules))
$modules = DOCROOT.$modules;
// Make the system relative to the docroot
// Make the system relative to the docroot, for symlink'd index.php
if ( ! is_dir($system) AND is_dir(DOCROOT.$system))
$system = DOCROOT.$system;

2
system

@ -1 +1 @@
Subproject commit 2903bd8726f06337c3a0a15379ba2403ba3310ac
Subproject commit dc9e8832bf5d5e61f596b83a5c57d51cbeec707b