diff --git a/CHANGELOG-2.1.md b/CHANGELOG-2.1.md
index a78edf4a0d..005ff15227 100644
--- a/CHANGELOG-2.1.md
+++ b/CHANGELOG-2.1.md
@@ -40,7 +40,6 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
* changed the default profiler storage to use the filesystem instead of SQLite
* added support for placeholders in route defaults and requirements (replaced by the value set in the service container)
* added Filesystem component as a dependency
- * [BC BREAK] changed `session.xml` service name `session.storage.native` to `session.storage.native_file`
* added new session storage drivers to session.xml: `session.storage.native_memcache`, `session.storage.native_memcached`,
`session.storage.native_sqlite`, `session.storage.null`, `session.storage.memcache`,
and `session.storage.memcached`. Added `session.storage.mock_file` service for functional session testing.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
index 41f9a1d6d1..31d374aa6b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
@@ -38,5 +38,9 @@
+
+
+
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php
index f38403c181..849002dd53 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php
@@ -46,9 +46,9 @@ class SessionHelper extends Helper
return $this->session->get($name, $default);
}
- public function getFlash($type, $default = null)
+ public function getFlash($name, $default = null)
{
- return $this->session->getFlashes()->get($type);
+ return $this->session->getFlashes()->get($name);
}
public function getFlashes()
@@ -56,9 +56,9 @@ class SessionHelper extends Helper
return $this->session->getFlashes()->all();
}
- public function hasFlash($type)
+ public function hasFlash($name)
{
- return $this->session->getFlashes()->has($type);
+ return $this->session->getFlashes()->has($name);
}
/**