Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-24 12:40:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1605-bugfix-notificatoon

Browse source
This commit is contained in:
Michael Vogel 2016-05-23 06:49:31 +02:00
commit 39ce023158
4 changed files with 9434 additions and 9323 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boot.php
View file

@ -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. * Reverse the effect of magic_quotes_gpc if it is enabled.

2
include/plaintext.php
View file

@ -116,6 +116,8 @@ function get_attachment_data($body) {
if ($matches[1] != "") if ($matches[1] != "")
$url = $matches[1]; $url = $matches[1];
$url = html_entity_decode($url, ENT_QUOTES, 'UTF-8');
if ($url != "") if ($url != "")
$data["url"] = $url; $data["url"] = $url;

16077
view/de/messages.po
View file

File diff suppressed because it is too large Load diff

2674
view/de/strings.php
View file

File diff suppressed because it is too large Load diff