Improving FlashAndRedirectTrait

burzum · Jul 18, 2017 · e9e869a · e9e869a
1 parent fc88906
commit e9e869a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Controller/Component/FlashAndRedirectTrait.php b/src/Controller/Component/FlashAndRedirectTrait.php
@@ -10,6 +10,8 @@
 
 /**
  * FlashAndRedirectTrait
+ *
+ * @property \Cake\Controller\ComponentRegistry $_registry
  */
 trait FlashAndRedirectTrait {
 
@@ -71,8 +73,12 @@ protected function _handleFlash($type, $options) {
 				}
 
 				if (!isset($flashOptions['element'])) {
+					if (!$this->_registry->has('Flash')) {
+						$this->_registry->load('Flash');
+					}
+
 					$flashOptions['element'] = $type;
-					$this->Flash->set($options[$type . 'Message'], $flashOptions);
+					$this->_registry->get('Flash')->set($options[$type . 'Message'], $flashOptions);
 				}
 
 				return true;