mirror of
https://github.com/sbrl/Pepperminty-Wiki.git
synced 2024-12-22 01:35:02 +00:00
Merge branch 'master' of github.com:sbrl/Pepperminty-Wiki
This commit is contained in:
commit
c977aa830a
2 changed files with 5 additions and 4 deletions
|
@ -831,8 +831,9 @@ class search
|
|||
continue; // Skip terms we shouldn't search the page body for
|
||||
|
||||
// Loop over the pageindex and search the titles / tags
|
||||
reset($pageindex); // Reset array/object pointer
|
||||
foreach($pageindex as $pagename => $pagedata) {
|
||||
$obj = new ArrayObject($pageindex);
|
||||
$it = $obj->getIterator();
|
||||
foreach($it as $pagename => $pagedata) {
|
||||
// Setup a variable to hold the current page's id
|
||||
$pageid = null; // Cache the page id
|
||||
|
||||
|
|
|
@ -1101,9 +1101,9 @@ class PeppermintParsedown extends ParsedownExtra
|
|||
// The page name is made safe when Pepperminty Wiki does initial consistency checks (if it's unsafe it results in a 301 redirect)
|
||||
$page_name = parsedown_pagename_resolve($matches_url[1]);
|
||||
|
||||
$internal_link_text = "[[${page_name}]]";
|
||||
$internal_link_text = "[[{$page_name}]]";
|
||||
if(!empty($matches[1])) // If the display text isn't empty, then respect it
|
||||
$internal_link_text = "[[${page_name}¦{$matches[1]}]]";
|
||||
$internal_link_text = "[[{$page_name}¦{$matches[1]}]]";
|
||||
|
||||
$result = $this->inlineInternalLink([
|
||||
"text" => $internal_link_text
|
||||
|
|
Loading…
Reference in a new issue