Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix artisan.

This commit is contained in:
Taylor Otwell 2012-04-04 16:57:18 -05:00
parent 4bee6d1bca
commit 01a7991bd5
3 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
laravel/cli/artisan.php
View File

@ -2,6 +2,7 @@
use Laravel\Bundle; use Laravel\Bundle;
use Laravel\Config; use Laravel\Config;
use Laravel\Request;
/** /**
* Fire up the default bundle. This will ensure any dependencies that * Fire up the default bundle. This will ensure any dependencies that
@ -20,6 +21,16 @@
Config::set('database.default', $_SERVER['CLI']['DB']); Config::set('database.default', $_SERVER['CLI']['DB']);
} }
/**
* Overwrite the HttpFoundation request since we have set some of
* the server variables since it was created. This allows us to
* set the default database for the CLI task.
*/
use Symfony\Component\HttpFoundation\LaravelRequest as RequestFoundation;
Request::$foundation = RequestFoundation::createFromGlobals();
/** /**
* We will register all of the Laravel provided tasks inside the IoC * We will register all of the Laravel provided tasks inside the IoC
* container so they can be resolved by the task class. This allows * container so they can be resolved by the task class. This allows

36
laravel/core.php
View File

@ -162,3 +162,39 @@
{ {
Bundle::register($bundle, $config); Bundle::register($bundle, $config);
} }
/*
|--------------------------------------------------------------------------
| Magic Quotes Strip Slashes
|--------------------------------------------------------------------------
|
| Even though "Magic Quotes" are deprecated in PHP 5.3.x, they may still
| be enabled on the server. To account for this, we will strip slashes
| on all input arrays if magic quotes are enabled for the server.
|
*/
if (magic_quotes())
{
$magics = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
foreach ($magics as &$magic)
{
$magic = array_strip_slashes($magic);
}
}
/*
|--------------------------------------------------------------------------
| Create The HttpFoundation Request
|--------------------------------------------------------------------------
|
| Laravel uses the HttpFoundation Symfony component to handle the request
| and response functionality for the framework. This allows us to not
| worry about that boilerplate code and focus on what matters.
|
*/
use Symfony\Component\HttpFoundation\LaravelRequest as RequestFoundation;
Request::$foundation = RequestFoundation::createFromGlobals();

36
laravel/laravel.php
View File

@ -55,42 +55,6 @@
error_reporting(-1); error_reporting(-1);
/*
|--------------------------------------------------------------------------
| Magic Quotes Strip Slashes
|--------------------------------------------------------------------------
|
| Even though "Magic Quotes" are deprecated in PHP 5.3.x, they may still
| be enabled on the server. To account for this, we will strip slashes
| on all input arrays if magic quotes are enabled for the server.
|
*/
if (magic_quotes())
{
$magics = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
foreach ($magics as &$magic)
{
$magic = array_strip_slashes($magic);
}
}
/*
|--------------------------------------------------------------------------
| Create The HttpFoundation Request
|--------------------------------------------------------------------------
|
| Laravel uses the HttpFoundation Symfony component to handle the request
| and response functionality for the framework. This allows us to not
| worry about that boilerplate code and focus on what matters.
|
*/
use Symfony\Component\HttpFoundation\LaravelRequest as RequestFoundation;
Request::$foundation = RequestFoundation::createFromGlobals();
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Start The Application Bundle | Start The Application Bundle