diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.html.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.html.twig
index 79e4c0c4a2..8bfc8108f6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.html.twig
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.html.twig
@@ -19,11 +19,11 @@
{{ status_code }} {{ status_text }} - {{ exception.class|abbr_class }}
- {% set previous_count = exception.previouses|length %}
- {% if previous_count %}
+ {% set previous_count = exception.allPrevious|length %}
+ {% if previous_count|length %}
{{ previous_count }} linked Exception{{ previous_count > 1 ? 's' : '' }}:
- {% for i, previous in exception.previouses %}
+ {% for i, previous in exception.allPrevious %}
-
{{ previous.class|abbr_class }} »
diff --git a/src/Symfony/Component/HttpKernel/Exception/FlattenException.php b/src/Symfony/Component/HttpKernel/Exception/FlattenException.php
index c178eb1f6c..40f40c8b86 100644
--- a/src/Symfony/Component/HttpKernel/Exception/FlattenException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/FlattenException.php
@@ -47,7 +47,7 @@ class FlattenException
public function toArray()
{
$exceptions = array();
- foreach (array_merge(array($this), $this->getPreviouses()) as $exception) {
+ foreach (array_merge(array($this), $this->getAllPrevious()) as $exception) {
$exceptions[] = array(
'message' => $exception->getMessage(),
'class' => $exception->getClass(),
@@ -118,7 +118,7 @@ class FlattenException
$this->previous = $previous;
}
- public function getPreviouses()
+ public function getAllPrevious()
{
$exceptions = array();
$e = $this;
diff --git a/tests/Symfony/Tests/Component/HttpKernel/Exception/FlattenExceptionTest.php b/tests/Symfony/Tests/Component/HttpKernel/Exception/FlattenExceptionTest.php
index 48dcd77886..a10e96f9ca 100644
--- a/tests/Symfony/Tests/Component/HttpKernel/Exception/FlattenExceptionTest.php
+++ b/tests/Symfony/Tests/Component/HttpKernel/Exception/FlattenExceptionTest.php
@@ -42,7 +42,7 @@ class FlattenExceptionTest extends \PHPUnit_Framework_TestCase
$this->assertSame($flattened2,$flattened->getPrevious());
- $this->assertSame(array($flattened2),$flattened->getPreviouses());
+ $this->assertSame(array($flattened2),$flattened->getAllPrevious());
}
/**
@@ -71,4 +71,4 @@ class FlattenExceptionTest extends \PHPUnit_Framework_TestCase
array(new \Exception('test', 123), 500),
);
}
-}
\ No newline at end of file
+}