Skip to content

Commit e6e426e

Browse files
committed
Merge branch '4.0' into 'main'
2 parents 8b372e8 + 8d6c83d commit e6e426e

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ This is a log of major user-visible changes in each phpMyFAQ release.
2828
- migrated from Webpack to Vite v6 (Thorsten)
2929
- migrated from Jest to Vitest v3 (Thorsten)
3030

31+
### phpMyFAQ v4.0.9 - unreleased
32+
33+
- fixed bugs (Thorsten)
34+
3135
### phpMyFAQ v4.0.8 - 2025-05-10
3236

3337
- updated third party dependencies (Thorsten)

docs/administration.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,9 @@ It is possible to use various languages per category, too; there's also a fronte
6363
For accessibility and SEO reasons, you should add a small description for every category.
6464
You can add an image for every category, which will be shown even on the start page if you flag this category with this
6565
configuration.
66-
If you add a new category, you can set the permissions for users and groups, and you can bind an administrator to new
66+
If you add a new category, you can set the permissions for users and groups, and you can bind a moderator to the new
6767
category.
68+
The moderator, e.g., can be responsible for the content of the category and can support the normal administrator.
6869
This is quite nice if you want to share the work in your FAQ between various admin users.
6970

7071
If you display category images, they are saved as separate files in /content/user/images/ as follows:

phpmyfaq/add.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
$displayFullForm = false;
7070
if (!is_null($selectedQuestion)) {
7171
$questionData = $questionObject->get($selectedQuestion);
72-
$question = Strings::htmlentities($questionData['question']);
72+
$question = $questionData['question'];
7373
if (Strings::strlen($question) !== 0) {
7474
$readonly = ' readonly';
7575
}

0 commit comments

Comments
 (0)