strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/friendica

Browse source
This commit is contained in:
Tobias Diekershoff 2012-02-23 09:04:00 +01:00
commit 734cdcef28
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README
View file

@ -1,3 +0,0 @@
This is my personal fork of https://github.com/friendica/friendica
If you want to have a stable version of friendica please look there.

4
include/bb2diaspora.php
View file

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