adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'flash-plugin' into 2.7

Browse source 
Fixes the plugin option not working with `__call` on FlashComponent as
documented.

Fixes #7570
This commit is contained in:
mark_story 2015-10-17 20:59:47 -04:00
commit d220616b5a
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Cake/Controller/Component/FlashComponent.php
View file

@ -76,13 +76,11 @@ class FlashComponent extends Component {
$message = $message->getMessage(); $message = $message->getMessage();
} }
list($plugin, $element) = pluginSplit($options['element']); list($plugin, $element) = pluginSplit($options['element'], true);
if (!empty($options['plugin'])) {
if ($plugin) { $plugin = $options['plugin'] . '.';
$options['element'] = $plugin . '.Flash/' . $element;
} else {
$options['element'] = 'Flash/' . $element;
} }
$options['element'] = $plugin . 'Flash/' . $element;
CakeSession::write('Message.' . $options['key'], array( CakeSession::write('Message.' . $options['key'], array(
'message' => $message, 'message' => $message,

10
lib/Cake/Test/Case/Controller/Component/FlashComponentTest.php
View file

@ -158,6 +158,16 @@ class FlashComponentTest extends CakeTestCase {
$result = CakeSession::read('Message.flash'); $result = CakeSession::read('Message.flash');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$this->Flash->alert('It worked', array('plugin' => 'MyPlugin'));
$expected = array(
'message' => 'It worked',
'key' => 'flash',
'element' => 'MyPlugin.Flash/alert',
'params' => array()
);
$result = CakeSession::read('Message.flash');
$this->assertEquals($expected, $result);
$this->Flash->error('It did not work', array('element' => 'error_thing')); $this->Flash->error('It did not work', array('element' => 'error_thing'));
$expected = array( $expected = array(
'message' => 'It did not work', 'message' => 'It did not work',