Commit fca18b4b authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'F12541PageAndLinkWithoutPageAlias' into 'develop'

Fixes #12541 - if omitted, default is set to current page id.

See merge request !368
parents 251870d5 178ce94b
Pipeline #6503 passed with stages
in 2 minutes and 52 seconds
......@@ -707,7 +707,7 @@ Column: _link
+---+---+--------------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
|x | |Mail |m:<email> |m:info@example.com |Default link class: email |
+---+---+--------------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
|x | |Page |p:<pageId> |p:impressum |Prepend '?' or '?id=', no hostname qualifier (automatically set by browser) |
|x | |Page |p:<pageId> |p:impressum |Prepend '?' or '?id=', no hostname qualifier (automatically set by browser). If omitted, default is current page id. |
+---+---+--------------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
|x | |Download |d:[<exportFilename>] |d:complete.pdf |Link points to `.../typo3conf/ext/qfq/Api/download.php`. Additional parameter SIP encoded. 'Download' needs SIP. See :ref:`download`. |
+---+---+--------------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
......
......@@ -760,8 +760,8 @@ class Link {
$keyName = $this->tableVarName[$key]; // convert token to name
if ($key == TOKEN_PAGE && $value == '') {
$value = $this->store->getVar(TYPO3_PAGE_ID, STORE_TYPO3); // If no pageid|pagealias is defined, take current page
if ($key == TOKEN_PAGE && ($value == '' || $value[0] == '&')) {
$value = $this->store->getVar(TYPO3_PAGE_ID, STORE_TYPO3) . $value; // If no pageid|pagealias is defined, take current page
}
$value = Token::checkForEmptyValue($key, $value);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment