diff --git a/laravel/documentation/changes.md b/laravel/documentation/changes.md index 95da5acd..402ee228 100644 --- a/laravel/documentation/changes.md +++ b/laravel/documentation/changes.md @@ -41,6 +41,7 @@ ## Laravel 3.2 - Allows pivot table timestamps to be disabled. - Made the `get_timestamp` Eloquent method static. - `Request::secure` now takes `application.ssl` configuration option into consideration. +- Simplified the `paths.php` file. ## Upgrading From 3.1 diff --git a/paths.php b/paths.php index 0dfed818..000c44a0 100644 --- a/paths.php +++ b/paths.php @@ -9,17 +9,9 @@ */ // -------------------------------------------------------------- -// Initialize the web variable if it doesn't exist. +// Change to the current working directory. // -------------------------------------------------------------- -if ( ! isset($web)) $web = false; - -// -------------------------------------------------------------- -// Change to the current directory if not from the web. -// -------------------------------------------------------------- -if ( ! $web) -{ - chdir(__DIR__); -} +chdir(__DIR__); // -------------------------------------------------------------- // Define the directory separator for the environment. @@ -57,22 +49,13 @@ // -------------------------------------------------------------- // The path to the public directory. // -------------------------------------------------------------- -if ($web) -{ - $GLOBALS['laravel_paths']['public'] = realpath('').DS; -} -else -{ - $paths['public'] = 'public'; -} +$paths['public'] = 'public'; // -------------------------------------------------------------- // Define each constant if it hasn't been defined. // -------------------------------------------------------------- foreach ($paths as $name => $path) { - if ($web) $path = "../{$path}"; - if ( ! isset($GLOBALS['laravel_paths'][$name])) { $GLOBALS['laravel_paths'][$name] = realpath($path).DS;