[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] prefixalias: The itemId was getting removed
"Jonny Bradley \(@jonnybradley\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <6a20041078cdb_382837dc098558@gitlab-sidekiq-low-urgency-cpu-bound-v2-dd68975fd-p769j.mail> |
Jonny Bradley pushed to branch master at Tiki Wiki CMS Groupware / Tiki Commits: aa93dda0 by luci at 2026-06-03T10:19:55+00:00 [FIX] prefixalias: The itemId was getting removed --- * [FIX] prefixalias: The itemId was getting removed --- * [FIX] prefixalias: The itemId was getting removed in `$wikilib->sefurl` so adapt `get_trackeritem_pagealias` to keep the seful (or not) page name/slug separate and add the itemId after See merge request tikiwiki/tiki!10253 (cherry picked from commit 0a6d950e04b2b74ddc015c3bd2848253d5f09205) 7f08ceaa [FIX] prefixalias: The itemId was getting removed in `$wikilib->sefurl` so... Co-authored-by: Jonny Bradley <[email protected]> See merge request tikiwiki/tiki!10367 - - - - - 3 changed files: - lib/smarty_tiki/Modifier/Sefurl.php - lib/trackers/trackerlib.php - tiki-sefurl.php Changes: ===================================== lib/smarty_tiki/Modifier/Sefurl.php ===================================== @@ -129,6 +129,11 @@ class Sefurl } if ($replacementpage) { $href = \TikiLib::tikiUrlOpt($wikilib->sefurl($replacementpage, $with_next, $all_langs)); + if ($prefs['feature_sefurl'] === 'y') { + $href .= $source; + } else { + $href .= "&itemId=$source"; + } if ($prefs['feature_sefurl_title_trackeritem'] == 'y') { $title = $trklib->get_title_sefurl($source); } ===================================== lib/trackers/trackerlib.php ===================================== @@ -961,7 +961,7 @@ class TrackerLib extends TikiLib $p_links = $semanticlib->getLinksUsing('prefixalias', ['fromPage' => $target]); if (count($p_links)) { - $ret = $p_links[0]['toPage'] . $itemId; + $ret = $p_links[0]['toPage']; return $ret; } else { return false; ===================================== tiki-sefurl.php ===================================== @@ -115,7 +115,7 @@ function filter_out_sefurl($tpl_output, $type = null, $title = '', $with_next = $pagealias = $trklib->get_trackeritem_pagealias($matches[1]) ) { $title = ''; - $tpl_output = "./tiki-index.php?page=" . $pagealias; + $tpl_output = "./tiki-index.php?page={$pagealias}&itemId={$matches[1]}"; } } } View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/aa93dda096bdfd651f4bb3553c741611e4c9dc25 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/aa93dda096bdfd651f4bb3553c741611e4c9dc25 You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help _______________________________________________ TikiWiki-cvs mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs