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

Merge pull request #9488 from tersmitten/lastaction-should-also-work-with-named-parameters-in-the-url-2x

Browse source 
_lastAction() should also work with named parameters in the url
This commit is contained in:
Mark Story 2016-09-24 21:04:14 -04:00 committed by GitHub
commit 5e0dc218f1
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
View file

@ -10648,4 +10648,36 @@ class FormHelperTest extends CakeTestCase {
$this->assertEquals($expected, $result);
}
/**
* Tests `_lastAction`.
*
* With named, numeric value
*
* @return void
*/
public function testLastActionWithNamedNumeric() {
$here = '/users/index/page:1';
$this->Form->request->here = $here;
$this->Form->create('User');
$this->assertAttributeEquals($here, '_lastAction', $this->Form, "_lastAction shouldn't be empty.");
}
/**
* Tests `_lastAction`.
*
* With named, string value
*
* @return void
*/
public function testLastActionWithNamedString() {
$here = '/users/index/foo:bar';
$this->Form->request->here = $here;
$this->Form->create('User');
$this->assertAttributeEquals($here, '_lastAction', $this->Form, "_lastAction shouldn't be empty.");
}
}

2
lib/Cake/View/Helper/FormHelper.php
View file

@ -3107,7 +3107,7 @@ class FormHelper extends AppHelper {
* @return void
*/
protected function _lastAction($url) {
$action = html_entity_decode($this->url($url), ENT_QUOTES);
$action = html_entity_decode($this->url($url, true), ENT_QUOTES);
$query = parse_url($action, PHP_URL_QUERY);
$query = $query ? '?' . $query : '';
$this->_lastAction = parse_url($action, PHP_URL_PATH) . $query;