Browse Source

Use fewer lines to assign post/query params.

mark_story 11 years ago
parent
commit
d8f0b8ccbd
1 changed files with 6 additions and 13 deletions
  1. 6 13
      src/Routing/RequestActionTrait.php

+ 6 - 13
src/Routing/RequestActionTrait.php

@@ -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();