aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib/NativeWikiPage.php
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2020-03-06 10:26:19 +0100
committerMax Kostikov <max@kostikov.co>2020-03-06 10:26:19 +0100
commitae691bdc7cbb684afc2ce6f759a4c1701b019849 (patch)
treeee4bd761efbd1ffd110575a85b4594857f377989 /Zotlabs/Lib/NativeWikiPage.php
parent082826ee444cb1a24306a128c64cb2e7de631291 (diff)
parent85c07d57fe0f468eb8cc84584f3636b590aa929f (diff)
downloadvolse-hubzilla-ae691bdc7cbb684afc2ce6f759a4c1701b019849.tar.gz
volse-hubzilla-ae691bdc7cbb684afc2ce6f759a4c1701b019849.tar.bz2
volse-hubzilla-ae691bdc7cbb684afc2ce6f759a4c1701b019849.zip
Merge branch 'dev' into 'dev'
Sync dev See merge request kostikov/core!1
Diffstat (limited to 'Zotlabs/Lib/NativeWikiPage.php')
-rw-r--r--Zotlabs/Lib/NativeWikiPage.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php
index dddd26af3..d84cc50a8 100644
--- a/Zotlabs/Lib/NativeWikiPage.php
+++ b/Zotlabs/Lib/NativeWikiPage.php
@@ -530,8 +530,11 @@ class NativeWikiPage {
foreach ($match[1] as $m) {
// TODO: Why do we need to double urlencode for this to work?
//$pageURLs[] = urlencode(urlencode(escape_tags($m)));
- $pageURLs[] = Zlib\NativeWiki::name_encode(escape_tags($m));
- $pages[] = $m;
+ $titleUri = explode('|',$m);
+ $page = $titleUri[0] ?? '';
+ $title = $titleUri[1] ?? $page;
+ $pageURLs[] = Zlib\NativeWiki::name_encode(escape_tags($page));
+ $pages[] = $title;
}
$idx = 0;
while(strpos($s,'[[') !== false) {