Commit 2b88c788 authored by Taylor Otwell's avatar Taylor Otwell

simplified the paths.php file.

parent 1847a369
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
- Allows pivot table timestamps to be disabled. - Allows pivot table timestamps to be disabled.
- Made the `get_timestamp` Eloquent method static. - Made the `get_timestamp` Eloquent method static.
- `Request::secure` now takes `application.ssl` configuration option into consideration. - `Request::secure` now takes `application.ssl` configuration option into consideration.
- Simplified the `paths.php` file.
<a name="upgrade-3.2"></a> <a name="upgrade-3.2"></a>
## Upgrading From 3.1 ## Upgrading From 3.1
......
...@@ -9,17 +9,9 @@ ...@@ -9,17 +9,9 @@
*/ */
// -------------------------------------------------------------- // --------------------------------------------------------------
// Initialize the web variable if it doesn't exist. // Change to the current working directory.
// -------------------------------------------------------------- // --------------------------------------------------------------
if ( ! isset($web)) $web = false; chdir(__DIR__);
// --------------------------------------------------------------
// Change to the current directory if not from the web.
// --------------------------------------------------------------
if ( ! $web)
{
chdir(__DIR__);
}
// -------------------------------------------------------------- // --------------------------------------------------------------
// Define the directory separator for the environment. // Define the directory separator for the environment.
...@@ -57,22 +49,13 @@ $paths['storage'] = 'storage'; ...@@ -57,22 +49,13 @@ $paths['storage'] = 'storage';
// -------------------------------------------------------------- // --------------------------------------------------------------
// The path to the public directory. // The path to the public directory.
// -------------------------------------------------------------- // --------------------------------------------------------------
if ($web) $paths['public'] = 'public';
{
$GLOBALS['laravel_paths']['public'] = realpath('').DS;
}
else
{
$paths['public'] = 'public';
}
// -------------------------------------------------------------- // --------------------------------------------------------------
// Define each constant if it hasn't been defined. // Define each constant if it hasn't been defined.
// -------------------------------------------------------------- // --------------------------------------------------------------
foreach ($paths as $name => $path) foreach ($paths as $name => $path)
{ {
if ($web) $path = "../{$path}";
if ( ! isset($GLOBALS['laravel_paths'][$name])) if ( ! isset($GLOBALS['laravel_paths'][$name]))
{ {
$GLOBALS['laravel_paths'][$name] = realpath($path).DS; $GLOBALS['laravel_paths'][$name] = realpath($path).DS;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment