Skip to content

Commit

Permalink
Merge branch '4.0' into 'main'
Browse files Browse the repository at this point in the history
  • Loading branch information
thorsten committed Feb 4, 2025
2 parents 9ce1295 + 34366de commit ceed225
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions docs/administration.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ time with all the relevant data of the specific entry. The meaning of the fields
The content is an answer to the question or a solution for a problem. The content can be edited with the included
WYSIWYG (**W**hat **Y**ou **S**ee **I**s **W**hat **Y**ou **G**et) editor when JavaScript is enabled. You can place
images where you want with the integrated image manager. The Editor can be disabled in the configuration if you want.
One important thing to remember is that you need to allow external hosts for images or videos in the configuration if
you want to use images from external sources.

- **Language**
You can select the language of your FAQ. By default, the selected language saved in the configuration will be chosen.
Expand Down
4 changes: 2 additions & 2 deletions phpmyfaq/admin/assets/src/utils/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ const toggleSessionWarningModal = (toggle: string | null): void => {
};

const reloadCurrentPage = (): void => {
const reloadButton = document.getElementById('pmf-button-reload-page');
const reloadButton = document.getElementById('pmf-button-reload-page') as HTMLButtonElement;
if (reloadButton) {
reloadButton.addEventListener('click', () => {
reloadButton.addEventListener('click', (): void => {
location.reload();
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public function upload(Request $request): JsonResponse

// Accept upload if there was no origin, or if it is an accepted origin
$fileName = $timestamp . '_' . $file->getClientOriginalName();
$fileName = str_replace(' ', '_', $fileName);
$file->move($uploadDir, $fileName);

// Add to the list of uploaded files
Expand Down

0 comments on commit ceed225

Please sign in to comment.