|
|
@@ -98,14 +98,6 @@ trait RequestActionTrait {
|
|
|
['autoRender' => 0, 'return' => 1, 'bare' => 1, 'requested' => 1],
|
|
|
$extra
|
|
|
);
|
|
|
- $post = $query = [];
|
|
|
- if (isset($extra['post'])) {
|
|
|
- $post = $extra['post'];
|
|
|
- }
|
|
|
- if (isset($extra['query'])) {
|
|
|
- $query = $extra['query'];
|
|
|
- }
|
|
|
- unset($extra['post'], $extra['query']);
|
|
|
|
|
|
$baseUrl = Configure::read('App.fullBaseUrl');
|
|
|
if (is_string($url) && strpos($url, $baseUrl) === 0) {
|
|
|
@@ -126,13 +118,14 @@ trait RequestActionTrait {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (!empty($post)) {
|
|
|
- $params['post'] = $post;
|
|
|
+ $params['post'] = $params['query'] = [];
|
|
|
+ if (isset($extra['post'])) {
|
|
|
+ $params['post'] = $extra['post'];
|
|
|
}
|
|
|
-
|
|
|
- if (!empty($query)) {
|
|
|
- $params['query'] = $query;
|
|
|
+ if (isset($extra['query'])) {
|
|
|
+ $params['query'] = $extra['query'];
|
|
|
}
|
|
|
+ unset($extra['post'], $extra['query']);
|
|
|
|
|
|
$params['session'] = isset($extra['session']) ? $extra['session'] : new Session();
|
|
|
|