From c82de330c0fbcb3c67ff9ddfecb69c5f19823946 Mon Sep 17 00:00:00 2001
From: Carsten Rose <carsten.rose@math.uzh.ch>
Date: Mon, 21 Jan 2019 10:36:27 +0100
Subject: [PATCH] Fixes #7695: Form/URL Forward: pageAlias not substituted
---
doc/CODING.md | 2 +-
extension/Source/core/QuickFormQuery.php | 4 ++--
extension/Source/core/store/Store.php | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/CODING.md b/doc/CODING.md
index 49244e345..11ca848d1 100644
--- a/doc/CODING.md
+++ b/doc/CODING.md
@@ -60,7 +60,7 @@ LOAD
* The PHP code api/save.php, api/load.php is called directly, without any TYPO3 Framework. Therefore the Typo3 information
'pageId', 'feUser*', 'beUser*', 'ttContentUid', ... is not available.
* *Form load*: an additional hidden Formelement '_sipForTypo3Vars' will be created with a subset of the current
- STORE_TYPO3 values. The workaround with the SIP is usefull, cause the same form can be shown on different places (QFQ records) -
+ STORE_TYPO3 values. The workaround with the SIP is useful, cause the same form can be shown on different places (QFQ records) -
this is not very likely, but might happen. The 'on the fly rendered' SIP helps to deliver the status.
AbstractBuildForm.php: process() > prepareT3VarsForSave() > Store.php: copyT3VarsToSip();
* *Form save*: FillStoreForm.php: process() > Store: fillTypo3StoreFromSip()
diff --git a/extension/Source/core/QuickFormQuery.php b/extension/Source/core/QuickFormQuery.php
index 8c14d97e0..4e2b252e7 100644
--- a/extension/Source/core/QuickFormQuery.php
+++ b/extension/Source/core/QuickFormQuery.php
@@ -656,7 +656,7 @@ class QuickFormQuery {
*
* '$this->formSpec[F_FORWARD_PAGE]':
* a) url http://www.nzz.ch/index.html?a=123#bottom, website.html?a=123#bottom,
- * ?<T3 Alias pageid>&a=123#bottom, ?id=<T3 page id>&a=123#bottom
+ * ?[id=]<T3 Alias pageid>&a=123#bottom, ?id=<T3 page id>&a=123#bottom
* b) mode no|client|url|...
* c) mode|url combination of above
*
@@ -669,7 +669,7 @@ class QuickFormQuery {
*/
private function setForwardModePage() {
- if ('url' != substr($this->formSpec[F_FORWARD_MODE], 0, 3)) {
+ if (F_FORWARD_MODE_URL != substr($this->formSpec[F_FORWARD_MODE], 0, 3)) {
return false;
}
diff --git a/extension/Source/core/store/Store.php b/extension/Source/core/store/Store.php
index 9e32bea39..325c34f59 100644
--- a/extension/Source/core/store/Store.php
+++ b/extension/Source/core/store/Store.php
@@ -844,7 +844,7 @@ class Store {
$tempArray = self::getStore(STORE_TYPO3);
- foreach ([TYPO3_FE_USER, TYPO3_FE_USER_UID, TYPO3_FE_USER_GROUP, TYPO3_TT_CONTENT_UID, TYPO3_PAGE_ID, TYPO3_PAGE_TYPE, TYPO3_PAGE_LANGUAGE, TYPO3_BE_USER_LOGGED_IN] as $key) {
+ foreach ([TYPO3_FE_USER, TYPO3_FE_USER_UID, TYPO3_FE_USER_GROUP, TYPO3_TT_CONTENT_UID, TYPO3_PAGE_ID, TYPO3_PAGE_ALIAS, TYPO3_PAGE_TYPE, TYPO3_PAGE_LANGUAGE, TYPO3_BE_USER_LOGGED_IN] as $key) {
if (isset($tempArray[$key])) {
$t3varsArray[$key] = $tempArray[$key];
}
--
GitLab