Browse Source

simplified the paths.php file.

Taylor Otwell 12 years ago
parent
commit
2b88c78896
2 changed files with 4 additions and 20 deletions
  1. 1 0
      laravel/documentation/changes.md
  2. 3 20
      paths.php

+ 1 - 0
laravel/documentation/changes.md

@@ -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

+ 3 - 20
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.
 // Define the directory separator for the environment.
@@ -57,22 +49,13 @@ $paths['storage'] = 'storage';
 // --------------------------------------------------------------
 // --------------------------------------------------------------
 // The path to the public directory.
 // 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.
 // 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;