fix: added handling of URL fragments, closes #1467

thorsten · Apr 21, 2020 · 74d305f · 74d305f
1 parent 6064478
commit 74d305f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/phpmyfaq/faq.php b/phpmyfaq/faq.php
@@ -90,13 +90,18 @@
 $faqVisits = new Visits($faqConfig);
 $faqVisits->logViews($recordId);
 
-// Add Glossary entries for answers only
 $question = $faq->getRecordTitle($recordId);
 if ($faqConfig->get('main.enableMarkdownEditor')) {
     $answer = $markDown->text($faq->faqRecord['content']);
 } else {
     $answer = $faqHelper->renderMarkupContent($faq->faqRecord['content']);
 }
+
+// Rewrite URL fragments
+$currentUrl = htmlspecialchars("//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}", ENT_QUOTES, 'UTF-8');
+$answer = $faqHelper->rewriteUrlFragments($answer, $currentUrl);
+
+// Add Glossary entries for answers only
 $answer = $oGlossary->insertItemsIntoContent($answer);
 
 // Set the path of the current category

diff --git a/phpmyfaq/src/phpMyFAQ/Helper/FaqHelper.php b/phpmyfaq/src/phpMyFAQ/Helper/FaqHelper.php
@@ -63,14 +63,25 @@ public function setSsl($ssl)
     /**
      * Rewrites the CSS class generated by TinyMCE for HighlightJS.
      *
-     * @param  string $answer
+     * @param string $answer
      * @return string
      */
     public function renderMarkupContent(string $answer): string
     {
         return str_replace('class="language-markup"', 'class="language-html"', $answer);
     }
 
+    /**
+     * Extends URL fragments (e.g. <a href="#foo">) with the full default URL.
+     * @param string $answer
+     * @param string $currentUrl
+     * @return string
+     */
+    public function rewriteUrlFragments(string $answer, string $currentUrl): string
+    {
+        return str_replace('href="#', 'href="' . $currentUrl . '#', $answer);
+    }
+
     /**
      * Renders a Share on Twitter link.
      *