harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into notify

Browse Source
This commit is contained in:
friendica
2012-02-23 00:30:17 -08:00
parent fd43e2c563 734cdcef28
commit d9e9fd0359
5 changed files with 155 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/bb2diaspora.php
View File

@@ -14,8 +14,8 @@ require_once('include/html2bbcode.php');
function diaspora2bb($s) {
// for testing purposes: Collect raw markdown articles
$file = tempnam("/tmp/friendica/", "markdown");
file_put_contents($file, $s);
// $file = tempnam("/tmp/friendica/", "markdown");
// file_put_contents($file, $s);
$s = html_entity_decode($s,ENT_COMPAT,'UTF-8');