Merge remote-tracking branch 'upstream/develop' into 1605-bugfix-notificatoon
This commit is contained in:
commit
39ce023158
4 changed files with 9434 additions and 9323 deletions
4
boot.php
4
boot.php
|
@ -387,6 +387,10 @@ define ( 'GRAVITY_COMMENT', 6);
|
|||
/* @}*/
|
||||
|
||||
|
||||
// Normally this constant is defined - but not if "pcntl" isn't installed
|
||||
if (!defined("SIGTERM"))
|
||||
define("SIGTERM", 15);
|
||||
|
||||
/**
|
||||
*
|
||||
* Reverse the effect of magic_quotes_gpc if it is enabled.
|
||||
|
|
|
@ -116,6 +116,8 @@ function get_attachment_data($body) {
|
|||
if ($matches[1] != "")
|
||||
$url = $matches[1];
|
||||
|
||||
$url = html_entity_decode($url, ENT_QUOTES, 'UTF-8');
|
||||
|
||||
if ($url != "")
|
||||
$data["url"] = $url;
|
||||
|
||||
|
|
16077
view/de/messages.po
16077
view/de/messages.po
File diff suppressed because it is too large
Load diff
2674
view/de/strings.php
2674
view/de/strings.php
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue