From b08020fd4c6816640f33e6419f08fef62b1df5d6 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Mon, 5 Jan 2015 15:02:22 +1100 Subject: [PATCH] Update CHANGELOG --- CHANGELOG.md | 3 +++ modules/cms/classes/Controller.php | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9549659d1..74c8716a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +* **Build 17x** (2015-01-xx) + - The variable `errors` will be included in a CMS page when redirecting via `Redirect::withErrors($validator)`. + * **Build 174** (2015-01-05) - Improved asset caching (`cms.enableAssetCache`), when enabled the server will send a *304 Not Modified* header. - Introduced new *Table* widget and *DataTable* form widget. diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php index 0a72a6590..dcb14b242 100644 --- a/modules/cms/classes/Controller.php +++ b/modules/cms/classes/Controller.php @@ -8,6 +8,7 @@ use View; use Lang; use Event; use Config; +use Session; use Request; use Response; use Exception; @@ -238,8 +239,8 @@ class Controller extends BaseController /* * Check for the presence of validation errors in the session. */ - $this->vars['errors'] = (Config::get('session.driver') && \Session::has('errors')) - ? \Session::get('errors') + $this->vars['errors'] = (Config::get('session.driver') && Session::has('errors')) + ? Session::get('errors') : new \Illuminate\Support\ViewErrorBag; /*