GitHub/WoltLab/WCF.git
4 years agoThe `data-user-id` is already set by the ReactionHandler
Alexander Ebert [Sat, 1 Aug 2020 15:22:54 +0000 (17:22 +0200)]
The `data-user-id` is already set by the ReactionHandler

Fixes #3463

4 years agoRevert "Whitelist `unserialize()` when running in enterprise mode"
Tim Düsterhus [Thu, 30 Jul 2020 09:26:47 +0000 (11:26 +0200)]
Revert "Whitelist `unserialize()` when running in enterprise mode"

`unserialize()` is unsafe, because it potentially allows for arbitrary
code execution.

This reverts commit 564ba8525e42c9d4677ee1ddac58c4c9c67fc113.

4 years agoClear language cache when clearing cronjob cache
Matthias Schmidt [Mon, 27 Jul 2020 16:44:45 +0000 (18:44 +0200)]
Clear language cache when clearing cronjob cache

Close #3465

4 years agoInvalid suffix value caused an error when rendering the form
Marcel Werk [Thu, 23 Jul 2020 10:30:53 +0000 (12:30 +0200)]
Invalid suffix value caused an error when rendering the form

4 years agoApproved `uniqid` for the use when running in enterprise mode
Alexander Ebert [Sun, 19 Jul 2020 16:04:42 +0000 (18:04 +0200)]
Approved `uniqid` for the use when running in enterprise mode

4 years agoMerge branch '3.1' into 5.2
Alexander Ebert [Sat, 18 Jul 2020 13:30:10 +0000 (15:30 +0200)]
Merge branch '3.1' into 5.2

4 years agoMoved the remark on the cleanup script
Alexander Ebert [Sat, 18 Jul 2020 13:29:14 +0000 (15:29 +0200)]
Moved the remark on the cleanup script

4 years agoMerge pull request #3450 from WoltLab/cms-embedded-object-remove
Alexander Ebert [Sat, 18 Jul 2020 13:28:13 +0000 (15:28 +0200)]
Merge pull request #3450 from WoltLab/cms-embedded-object-remove

Removed embedded object references when deleting articles / pages

4 years agoAdd update_com.woltlab.wcf_embeddedObjectOrphans.php
Tim Düsterhus [Fri, 17 Jul 2020 12:12:28 +0000 (14:12 +0200)]
Add update_com.woltlab.wcf_embeddedObjectOrphans.php

4 years agoAdd note about deletion of orphaned embedded objects
Tim Düsterhus [Fri, 17 Jul 2020 09:36:44 +0000 (11:36 +0200)]
Add note about deletion of orphaned embedded objects

see #3429

4 years agoRemove embedded object references when deleting pages
Tim Düsterhus [Fri, 17 Jul 2020 09:32:27 +0000 (11:32 +0200)]
Remove embedded object references when deleting pages

see #3429

4 years agoRemove embedded object references when deleting articles
Tim Düsterhus [Fri, 17 Jul 2020 09:25:24 +0000 (11:25 +0200)]
Remove embedded object references when deleting articles

see #3429

4 years agoMerge branch '3.1' into 5.2
Tim Düsterhus [Thu, 16 Jul 2020 09:26:21 +0000 (11:26 +0200)]
Merge branch '3.1' into 5.2

4 years agoFix PHP 5.5 compatibility
Tim Düsterhus [Thu, 16 Jul 2020 09:25:48 +0000 (11:25 +0200)]
Fix PHP 5.5 compatibility

4 years agoFix copy and paste bug
Tim Düsterhus [Thu, 16 Jul 2020 09:24:05 +0000 (11:24 +0200)]
Fix copy and paste bug

see 3cd8f5f63c1327c1534a4e24908b3e49d4074871

4 years agoMerge branch '3.1' into 5.2
Tim Düsterhus [Thu, 16 Jul 2020 08:42:45 +0000 (10:42 +0200)]
Merge branch '3.1' into 5.2

4 years agoProperly update page search index when editing
Tim Düsterhus [Thu, 16 Jul 2020 08:41:09 +0000 (10:41 +0200)]
Properly update page search index when editing

see #3430

4 years agoProperly update article search index when editing
Tim Düsterhus [Thu, 16 Jul 2020 08:40:38 +0000 (10:40 +0200)]
Properly update article search index when editing

see #3430

4 years agoMerge branch '3.1' into 5.2
Marcel Werk [Tue, 14 Jul 2020 17:09:42 +0000 (19:09 +0200)]
Merge branch '3.1' into 5.2

4 years agoImproved detection of the links to twitch's clips
Marcel Werk [Tue, 14 Jul 2020 17:09:26 +0000 (19:09 +0200)]
Improved detection of the links to twitch's clips

4 years agoFix VoidFormDataProcessor for `null` values
Matthias Schmidt [Tue, 14 Jul 2020 13:31:19 +0000 (15:31 +0200)]
Fix VoidFormDataProcessor for `null` values

4 years agoRelease 5.2.8 5.2.8
Alexander Ebert [Mon, 13 Jul 2020 11:14:17 +0000 (13:14 +0200)]
Release 5.2.8

4 years agoUpdating minified JavaScript files
woltlab.com [Mon, 13 Jul 2020 11:06:11 +0000 (11:06 +0000)]
Updating minified JavaScript files

4 years agoMerge branch '3.1' into 5.2
Alexander Ebert [Mon, 13 Jul 2020 10:59:40 +0000 (12:59 +0200)]
Merge branch '3.1' into 5.2

4 years agoRelease 3.1.16 3.1.16
Alexander Ebert [Mon, 13 Jul 2020 10:59:02 +0000 (12:59 +0200)]
Release 3.1.16

4 years agoAdd close callback to form builder dialog
Matthias Schmidt [Fri, 10 Jul 2020 16:04:47 +0000 (18:04 +0200)]
Add close callback to form builder dialog

4 years agoUpdating minified JavaScript files
woltlab.com [Thu, 9 Jul 2020 19:11:02 +0000 (19:11 +0000)]
Updating minified JavaScript files

4 years agoMerge branch '3.1' into 5.2
Alexander Ebert [Thu, 9 Jul 2020 19:09:02 +0000 (21:09 +0200)]
Merge branch '3.1' into 5.2

4 years agoPrevent Chromium browser form injecting base64 encoded images
Alexander Ebert [Thu, 9 Jul 2020 19:08:44 +0000 (21:08 +0200)]
Prevent Chromium browser form injecting base64 encoded images

4 years agoFix button class for single media form field
Matthias Schmidt [Wed, 8 Jul 2020 12:24:07 +0000 (14:24 +0200)]
Fix button class for single media form field

4 years agoFix duplicate data handler registration for captcha form fields
Matthias Schmidt [Wed, 8 Jul 2020 12:08:30 +0000 (14:08 +0200)]
Fix duplicate data handler registration for captcha form fields

Close #3441

4 years agoFixed error message in Form Builder
Peter Frühwirt [Wed, 8 Jul 2020 06:39:53 +0000 (08:39 +0200)]
Fixed error message in Form Builder

4 years agoWhitelist `unserialize()` when running in enterprise mode
Alexander Ebert [Tue, 7 Jul 2020 16:26:16 +0000 (18:26 +0200)]
Whitelist `unserialize()` when running in enterprise mode

4 years agoMerge branch '3.1' into 5.2
Tim Düsterhus [Tue, 7 Jul 2020 13:09:04 +0000 (15:09 +0200)]
Merge branch '3.1' into 5.2

4 years agoMerge pull request #3439 from WoltLab/cronjob-fix2
Tim Düsterhus [Tue, 7 Jul 2020 13:07:09 +0000 (15:07 +0200)]
Merge pull request #3439 from WoltLab/cronjob-fix2

Fix calculation of nextExec of cronjobs

4 years agoFix calculation of nextExec of cronjobs
Tim Düsterhus [Tue, 7 Jul 2020 12:26:20 +0000 (14:26 +0200)]
Fix calculation of nextExec of cronjobs

To properly calculate nextExec we must not specify the TIME_NOW parameter,
because if the cronjob is run on the scheduled time the nextExec() will
return the current time.

Not passing the TIME_NOW parameter adds at least 120 seconds of delay to
prevent this issue.

This bug was introduced in commit 485f8e1888824b862823de983e019afcb9bca7ce.
When moving the update of the execution time the calls were not correctly
moved and the explicit passing of TIME_NOW was added.

4 years agoRelease 5.2.8
Alexander Ebert [Mon, 6 Jul 2020 15:53:12 +0000 (17:53 +0200)]
Release 5.2.8

4 years agoMerge branch '3.1' into 5.2
Tim Düsterhus [Mon, 6 Jul 2020 15:21:01 +0000 (17:21 +0200)]
Merge branch '3.1' into 5.2

4 years agoMerge pull request #3428 from WoltLab/url-is
Tim Düsterhus [Mon, 6 Jul 2020 15:20:12 +0000 (17:20 +0200)]
Merge pull request #3428 from WoltLab/url-is

Fix Url::is()

4 years agoCaptcha setting was not considered
Marcel Werk [Mon, 6 Jul 2020 12:16:33 +0000 (14:16 +0200)]
Captcha setting was not considered

4 years agoUpdating minified JavaScript files
woltlab.com [Mon, 6 Jul 2020 11:25:05 +0000 (11:25 +0000)]
Updating minified JavaScript files

4 years agoRemoved misleading description
Marcel Werk [Mon, 6 Jul 2020 09:57:40 +0000 (11:57 +0200)]
Removed misleading description

4 years agoMissing module setting check
Marcel Werk [Mon, 6 Jul 2020 09:57:14 +0000 (11:57 +0200)]
Missing module setting check

4 years agoFixed parameter validation
Marcel Werk [Mon, 6 Jul 2020 09:56:56 +0000 (11:56 +0200)]
Fixed parameter validation

4 years agoMerge pull request #3435 from xopez/patch-1
Alexander Ebert [Fri, 3 Jul 2020 23:03:22 +0000 (01:03 +0200)]
Merge pull request #3435 from xopez/patch-1

Remove unused Packageservers for 5.2

4 years agoUpdate install.sql
xopez [Fri, 3 Jul 2020 18:00:39 +0000 (20:00 +0200)]
Update install.sql

4 years agoMerge pull request #3434 from WoltLab/fix-shadow-groups
Tim Düsterhus [Fri, 3 Jul 2020 15:15:49 +0000 (17:15 +0200)]
Merge pull request #3434 from WoltLab/fix-shadow-groups

Properly support multiple instances of WoltLabSuite/Core/Ui/ItemList/User

4 years agoProperly support multiple instances of WoltLabSuite/Core/Ui/ItemList/User
Tim Düsterhus [Fri, 3 Jul 2020 14:46:26 +0000 (16:46 +0200)]
Properly support multiple instances of WoltLabSuite/Core/Ui/ItemList/User

WoltLabSuite/Core/Ui/ItemList/User is a singleton and thus only has a single
instance of each object member. This lead to the `_shadowGroups` value being
fixed to the first input used.

Move the `_shadowGroups` into the existing `data` object (where the regular
`shadow` resides) to fix this issue.

Introduced in 8faf6ea10ac894b87b3e357f5248f67b4fd7b716.
Fixes #3433.

4 years agoMerge branch '3.1' into 5.2
Tim Düsterhus [Fri, 3 Jul 2020 13:55:33 +0000 (15:55 +0200)]
Merge branch '3.1' into 5.2

4 years agoMerge pull request #3432 from WoltLab/linked-blocked-img
Tim Düsterhus [Fri, 3 Jul 2020 13:53:39 +0000 (15:53 +0200)]
Merge pull request #3432 from WoltLab/linked-blocked-img

Fix markup for linked, blocked images in UGC

4 years agoFix markup for linked, blocked images in UGC
Tim Düsterhus [Fri, 3 Jul 2020 13:10:38 +0000 (15:10 +0200)]
Fix markup for linked, blocked images in UGC

Fixes #3384

4 years agoAdd missing closing quotation mark in English language item
Matthias Schmidt [Thu, 2 Jul 2020 16:46:13 +0000 (18:46 +0200)]
Add missing closing quotation mark in English language item

4 years agoFix Url::is()
Tim Düsterhus [Thu, 2 Jul 2020 14:40:16 +0000 (16:40 +0200)]
Fix Url::is()

`parse_url()` cannot be used to validate an URL, because it will accept
roughly everything. In fact this is documented in the parse_url() docs:

> This function is not meant to validate the given URL, it only breaks
> it up into the above listed parts. Partial URLs are also accepted,
> parse_url() tries its best to parse them correctly.

Fixes #3391

4 years agoMerge pull request #3413 from WoltLab/existingMapping
Alexander Ebert [Thu, 2 Jul 2020 11:20:39 +0000 (13:20 +0200)]
Merge pull request #3413 from WoltLab/existingMapping

Improve wording regarding existing import mapping

4 years agoUpdating minified JavaScript files
woltlab.com [Thu, 2 Jul 2020 10:32:06 +0000 (10:32 +0000)]
Updating minified JavaScript files

4 years agoFix formatting of text/plain notifications
Tim Düsterhus [Thu, 2 Jul 2020 09:55:33 +0000 (11:55 +0200)]
Fix formatting of text/plain notifications

see #325

4 years agoMerge pull request #3424 from WoltLab/resizer-strip-exif
Tim Düsterhus [Thu, 2 Jul 2020 09:44:58 +0000 (11:44 +0200)]
Merge pull request #3424 from WoltLab/resizer-strip-exif

Strip exif information from loaded image in Resizer#loadFile

4 years agoStrip exif information from loaded image in Resizer#loadFile
Tim Düsterhus [Thu, 2 Jul 2020 08:11:59 +0000 (10:11 +0200)]
Strip exif information from loaded image in Resizer#loadFile

Modern browsers take the Exif orientation into account when showing a JPEG
within an HTMLImageElement. Unfortunately this orientation is not only
visual, but extends to the blob received when reading this image into a
canvas.

The JavaScript based image resizer using within the attachment system takes
care reinsert the original Exif data after fetching the resized blob from
pica.js.

This causes the image to be reoriented multiple times, ultimately leading
to an incorrectly oriented image:

1. The browser rotates the image.
2. The server rotates the image again, because the original Exif information
   has been preserved.

To fix this issue we strip the Exif information before handing the blob over
to the HTMLImageElement, forcing the browser to use the raw pixels instead
of pretending to be smart. When the Exif information is reinserted after
resizing the image that will be uploaded will then be reoriented only once:
On the server.

During fixing of this bug it was also investigated whether one can find out
whether the browser reoriented the image, it looks like one cannot. It was
also tested whether setting `image-orientation: none` will have any effect.

It only has in Firefox: When image-orientation: none is set you will get
the behavior as if no Exif information is present.
In Chrome the source image will not be be reoriented when rendered inside
of the DOM. Reading the pixel values however still returns the reoriented
garbage.

Thus stripping the exif information is the best solution to combat web
browsers attempting to be smart. Unfortunately it comes with an increased
processing requirement, because the raw blob (possible multiple megabytes)
will need to be processed to strip the Exif data.

4 years agoFix formatting of wcf.acp.user.activation.mail.plaintext
Tim Düsterhus [Thu, 2 Jul 2020 09:16:59 +0000 (11:16 +0200)]
Fix formatting of wcf.acp.user.activation.mail.plaintext

4 years agoFix layout of text/plain version of userRegistration notification mail
Tim Düsterhus [Thu, 2 Jul 2020 09:00:18 +0000 (11:00 +0200)]
Fix layout of text/plain version of userRegistration notification mail

Whitespace is significant within the text/plain version, thus remove the
tabs like within all the other notifications.

4 years agoSimplify checking of existing of conditions on revoking trophies
joshuaruesweg [Wed, 1 Jul 2020 19:51:20 +0000 (21:51 +0200)]
Simplify checking of existing of conditions on revoking trophies
See #3422

4 years agoIncorrect check for legacy attachment dimensions
Alexander Ebert [Wed, 1 Jul 2020 19:16:26 +0000 (21:16 +0200)]
Incorrect check for legacy attachment dimensions

4 years agoFix revoking trophies w/o conditions yield an SQL error
joshuaruesweg [Wed, 1 Jul 2020 18:44:14 +0000 (20:44 +0200)]
Fix revoking trophies w/o conditions yield an SQL error
Fixes #3422

4 years agoMerge branch '3.1' into 5.2
Alexander Ebert [Wed, 1 Jul 2020 09:15:46 +0000 (11:15 +0200)]
Merge branch '3.1' into 5.2

4 years agoMerge pull request #3418 from WoltLab/cronjob-fix
Alexander Ebert [Wed, 1 Jul 2020 09:15:01 +0000 (11:15 +0200)]
Merge pull request #3418 from WoltLab/cronjob-fix

Fix detection of stuck cronjobs

4 years agoGet rid of useless class attribute CronjobScheduler::$cronjobEditors
Tim Düsterhus [Tue, 30 Jun 2020 12:16:42 +0000 (14:16 +0200)]
Get rid of useless class attribute CronjobScheduler::$cronjobEditors

Just use a simple return value here. It avoids having to carefully manage
class state.

4 years agoFix detection of stuck cronjobs
Tim Düsterhus [Tue, 30 Jun 2020 12:15:03 +0000 (14:15 +0200)]
Fix detection of stuck cronjobs

Consider the following scenario:

A cronjob is scheduled to run `0 * * * *` (i.e. every hour). The cronjob
successfully executes it's 23:00 execution belated on 23:30. Then the
nextExec will be 00:00. afterNextExec will be 01:00.

During night time nothing happens within the community, until at 05:xx when
the first user wakes up and opens their web browser. It restores two tabs
with our community and fetches them. Now the following will happen:

1. Request 1: Notices that the cronjob is due (00:00 < 05:xx). Setting
              the cronjob's state to pending and starting execution.
2. Request 2: Notices that the cronjob is overdue (01:00 < 05:xx,
              state = pending). Logging an error about a stuck job and
              setting the cronjob's state to ready.
3. Request 1: Finishes executing the cronjob and updates nextExec = 06:00,
              afterNextExec = 07:00, also setting the cronjob's state to
              ready.

Fix this issue by updating the times for the next executions together with
the update of the state in a single database query / transaction. This will
prevent other requests from seeing the cronjob with state = pending or
state = executing and an way outdated date.

A side effect of this change is that cronjobs will match the intended
schedule better.

Consider the following:

A cronjob running every minute, taking 5 seconds to execute. The execution
is triggered at 00:00:58. It will finish executing 00:01:03. Previously the
nextExec would be set to 00:02:00, now it will be 00:01:00. Thus the first
request after 00:01:03 (i.e. once the state is set back to ready) will
trigger execution, more closely matching the intended schedule.

4 years agoImprove error message for stuck cronjobs
Tim Düsterhus [Tue, 30 Jun 2020 12:07:51 +0000 (14:07 +0200)]
Improve error message for stuck cronjobs

4 years agoImprove wording regarding existing import mapping
Tim Düsterhus [Mon, 29 Jun 2020 15:30:40 +0000 (17:30 +0200)]
Improve wording regarding existing import mapping

Resolves WoltLab/com.woltlab.wcf.exporter#43

4 years agoMerge pull request #3409 from WoltLab/php8-handleError
Tim Düsterhus [Sun, 28 Jun 2020 14:10:01 +0000 (16:10 +0200)]
Merge pull request #3409 from WoltLab/php8-handleError

Fix PHP 8 compatibility for WCF::handleError()

4 years agoFix PHP 8 compatibility for WCF::handleError()
Tim Düsterhus [Sun, 28 Jun 2020 13:50:05 +0000 (15:50 +0200)]
Fix PHP 8 compatibility for WCF::handleError()

Quoting from the UPGRADING manual (https://github.com/php/php-src/blob/php-8.0.0alpha1/UPGRADING):

> The @ operator will no longer silence fatal errors (E_ERROR, E_CORE_ERROR,
> E_COMPILE_ERROR, E_USER_ERROR, E_RECOVERABLE_ERROR, E_PARSE). Error handlers
> that expect error_reporting to be 0 when @ is used, should be adjusted to
> use a mask check instead:

4 years agoMerge branch '3.1' into 5.2
Matthias Schmidt [Sun, 28 Jun 2020 12:35:49 +0000 (14:35 +0200)]
Merge branch '3.1' into 5.2

4 years agoHide empty tag box on tagged page
Matthias Schmidt [Sun, 28 Jun 2020 12:35:35 +0000 (14:35 +0200)]
Hide empty tag box on tagged page

4 years agoFix validation of url form field value
Matthias Schmidt [Sat, 27 Jun 2020 16:22:46 +0000 (18:22 +0200)]
Fix validation of url form field value

Close #3390

4 years agoRelease 5.2.7 5.2.7
Alexander Ebert [Sat, 27 Jun 2020 12:10:30 +0000 (14:10 +0200)]
Release 5.2.7

4 years agoUpdating minified JavaScript files
woltlab.com [Sat, 27 Jun 2020 11:45:51 +0000 (11:45 +0000)]
Updating minified JavaScript files

4 years agoMerge branch '3.1' into 5.2
Alexander Ebert [Sat, 27 Jun 2020 11:43:48 +0000 (13:43 +0200)]
Merge branch '3.1' into 5.2

4 years agoRelease 3.1.15 3.1.15
Alexander Ebert [Sat, 27 Jun 2020 10:54:23 +0000 (12:54 +0200)]
Release 3.1.15

4 years agoUpdating minified JavaScript files
woltlab.com [Sat, 27 Jun 2020 09:58:45 +0000 (09:58 +0000)]
Updating minified JavaScript files

4 years agoMerge branch '3.0' into 3.1
Alexander Ebert [Sat, 27 Jun 2020 09:56:53 +0000 (11:56 +0200)]
Merge branch '3.0' into 3.1

4 years agoPreparing the release 3.0.25 3.0.25
Alexander Ebert [Sat, 27 Jun 2020 09:52:48 +0000 (11:52 +0200)]
Preparing the release 3.0.25

4 years agoRevert "Preparing the release 3.1.15"
Alexander Ebert [Sat, 27 Jun 2020 09:51:15 +0000 (11:51 +0200)]
Revert "Preparing the release 3.1.15"

This reverts commit bd4d9de5fc28d17643c109fc87ae88f2d9265817.

4 years agoPreparing the release 3.1.15
Alexander Ebert [Sat, 27 Jun 2020 09:50:30 +0000 (11:50 +0200)]
Preparing the release 3.1.15

4 years agoIncorrect encoding of conditions
Alexander Ebert [Sat, 27 Jun 2020 09:41:29 +0000 (11:41 +0200)]
Incorrect encoding of conditions

4 years agoMerge branch '3.0' into 3.1
Alexander Ebert [Sat, 27 Jun 2020 09:40:49 +0000 (11:40 +0200)]
Merge branch '3.0' into 3.1

4 years agoIncorrect encoding of conditions
Alexander Ebert [Sat, 27 Jun 2020 09:39:05 +0000 (11:39 +0200)]
Incorrect encoding of conditions

4 years agoFix checking current value of radio button form fields
Matthias Schmidt [Sat, 27 Jun 2020 05:51:02 +0000 (07:51 +0200)]
Fix checking current value of radio button form fields

4 years agoWhitelist `parse_url` in enterprise mode
Tim Düsterhus [Fri, 26 Jun 2020 14:13:55 +0000 (16:13 +0200)]
Whitelist `parse_url` in enterprise mode

4 years agoMerge branch '3.1' into 5.2
Marcel Werk [Thu, 25 Jun 2020 09:04:07 +0000 (11:04 +0200)]
Merge branch '3.1' into 5.2

4 years agoFixed 'data too long for column username' issue
Marcel Werk [Thu, 25 Jun 2020 09:03:06 +0000 (11:03 +0200)]
Fixed 'data too long for column username' issue

4 years agoMerge branch '5.2' of github.com:WoltLab/WCF into 5.2
Matthias Schmidt [Wed, 24 Jun 2020 15:21:07 +0000 (17:21 +0200)]
Merge branch '5.2' of github.com:WoltLab/WCF into 5.2

4 years agoCheck for missing length of varchar columns
Matthias Schmidt [Wed, 24 Jun 2020 15:21:02 +0000 (17:21 +0200)]
Check for missing length of varchar columns

4 years agoFix updating decimal fields with default value (#3382)
Matthias Schmidt [Wed, 24 Jun 2020 15:12:47 +0000 (17:12 +0200)]
Fix updating decimal fields with default value (#3382)

MySQL stores the default value using the specified number of decimals so that when comparing the existing default value with the new default value, the same format should be used.

4 years agoMerge branch '3.1' into 5.2
Marcel Werk [Tue, 23 Jun 2020 15:38:51 +0000 (17:38 +0200)]
Merge branch '3.1' into 5.2

4 years agoArticle image did not always have the right content language
Marcel Werk [Tue, 23 Jun 2020 15:37:07 +0000 (17:37 +0200)]
Article image did not always have the right content language

4 years agoMerge branch '3.1' into 5.2
Marcel Werk [Tue, 23 Jun 2020 10:03:24 +0000 (12:03 +0200)]
Merge branch '3.1' into 5.2

4 years agoFixed 'Prepared statement contains too many placeholders' error in bulk processing
Marcel Werk [Tue, 23 Jun 2020 10:03:01 +0000 (12:03 +0200)]
Fixed 'Prepared statement contains too many placeholders' error in bulk processing

4 years agoMerge branch '3.1' into 5.2
Marcel Werk [Mon, 22 Jun 2020 22:03:16 +0000 (00:03 +0200)]
Merge branch '3.1' into 5.2

4 years agoMessage with the content "0" led to empty entries in recent activities
Marcel Werk [Mon, 22 Jun 2020 22:02:56 +0000 (00:02 +0200)]
Message with the content "0" led to empty entries in recent activities

4 years agoFix broken HTML markup
joshuaruesweg [Mon, 22 Jun 2020 14:44:05 +0000 (16:44 +0200)]
Fix broken HTML markup
The video can be placed within normal text (inside `<p>` elements). `<div>` elements are not allowed within `<p>` elements. Because the class `.videoContainer` is already a block element (via CSS), we can easily change the element type to `<span>`, which is allowed inside of `<p>` elements.