Merge branch '3.2'

Author: thorsten

phpmyfaq/src/phpMyFAQ/Faq.php

@@ -425,7 +425,7 @@ public function renderRecordsByCategoryId(int $categoryId, string $orderBy = 'id
                     $visits = $row->visits;
                 }
 
-                $title = $row->question;
+                $title = Strings::htmlentities($row->question);
                 $url = sprintf(
                     '%sindex.php?%saction=faq&cat=%d&id=%d&artlang=%s',
                     $this->config->getDefaultUrl(),

phpmyfaq/src/phpMyFAQ/Glossary.php

@@ -270,7 +270,7 @@ public function addGlossaryItem(string $item, string $definition): bool
             Database::getTablePrefix(),
             $this->config->getDb()->nextId(Database::getTablePrefix() . 'faqglossary', 'id'),
             $this->config->getLanguage()->getLanguage(),
-            Strings::htmlspecialchars($item),
+            Strings::htmlspecialchars(substr($item, 0, 254)),
             Strings::htmlspecialchars($this->definition)
         );
 
@@ -296,7 +296,7 @@ public function updateGlossaryItem(int $id, string $item, string $definition): b
         $query = sprintf(
             "UPDATE %sfaqglossary SET item = '%s', definition = '%s' WHERE id = %d AND lang = '%s'",
             Database::getTablePrefix(),
-            Strings::htmlspecialchars($item),
+            Strings::htmlspecialchars(substr($item, 0, 254)),
             Strings::htmlspecialchars($definition),
             $id,
             $this->config->getLanguage()->getLanguage()