Merge remote branch 'stfalcon/patch-2'

* stfalcon/patch-2:
  Small refact. Without this I get a php Notice and Warnig if try getFlash() after clearing the session:
This commit is contained in:
Fabien Potencier 2011-05-22 08:08:28 +02:00
commit b042366353

View File

@ -232,7 +232,7 @@ class Session implements \Serializable
public function getFlash($name, $default = null)
{
return array_key_exists($name, $this->attributes['_flash']) ? $this->attributes['_flash'][$name] : $default;
return array_key_exists($name, $this->getFlashes()) ? $this->attributes['_flash'][$name] : $default;
}
public function setFlash($name, $value)