ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved session class.

Browse Source
This commit is contained in:
Taylor Otwell
2011-11-09 21:55:21 -06:00
parent 75ba2447f8
commit 9e9ee931b5
9 changed files with 61 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
laravel/routing/controller.php
View File

@@ -130,9 +130,9 @@ abstract class Controller {
// If the controller has specified a layout view. The response
// returned by the controller method will be bound to that view
// and the layout will be considered the response.
if ( ! is_null($this->layout) and $this->viewable($response))
if (is_null($response) and ! is_null($this->layout))
{
$response = $this->layout->with('content', $response);
$response = $this->layout;
}
}
@@ -149,34 +149,6 @@ abstract class Controller {
return $response;
}
/**
* Deteremine if a given response is considered "viewable".
*
* This is primarily used to determine which types of responses should be
* bound to the controller's layout and which should not. We do not want
* to bind redirects and file downloads to the layout, as this obviously
* would not make any sense.
*
* @param mixed $response
* @return bool
*/
protected function viewable($response)
{
if ($response instanceof Response)
{
if ($response instanceof Redirect)
{
return false;
}
elseif ($response->headers['Content-Description'] == 'File Transfer')
{
return false;
}
}
return true;
}
/**
* Register filters on the controller's methods.
*
@@ -195,9 +167,9 @@ abstract class Controller {
*/
protected function filter($name, $filters)
{
$this->filters[] = new Filter_Collection($name, $filters);
$this->filters[$name][] = new Filter_Collection($name, $filters);
return $this->filters[count($this->filters) - 1];
return $this->filters[$name][count($this->filters) - 1];
}
/**
@@ -209,11 +181,13 @@ abstract class Controller {
*/
protected function filters($name, $method)
{
if ( ! isset($this->filters[$name])) return array();
$filters = array();
foreach ($this->filters as $filter)
foreach ($this->filters[$name] as $filter)
{
if ($filter->name === $name and $filter->applies($method))
if ($filter->applies($method))
{
$filters = array_merge($filters, $filter->filters);
}