Presenter: mix GET & POST params in AJAX only when signal is not pres…

…ent [Closes nette/forms#33][Closes nette/nette#1061]
nette · Apr 1, 2016 · 74fe94e · 74fe94e
1 parent 3f8f9bd
commit 74fe94e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Application/UI/Presenter.php b/src/Application/UI/Presenter.php
@@ -1222,11 +1222,13 @@ private function initGlobalParameters()
 		$selfParams = [];
 
 		$params = $this->request->getParameters();
-		if ($this->isAjax()) {
+
+		$postSignal = $this->request->getPost(self::SIGNAL_KEY);
+		if ($this->isAjax() && !Nette\Utils\Strings::endsWith($postSignal, self::NAME_SEPARATOR . 'submit')) {
 			$params += $this->request->getPost();
 		}
-		if (($tmp = $this->request->getPost(self::SIGNAL_KEY)) !== NULL) {
-			$params[self::SIGNAL_KEY] = $tmp;
+		if ($postSignal !== NULL) {
+			$params[self::SIGNAL_KEY] = $postSignal;
 		}
 
 		foreach ($params as $key => $value) {