diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-02-23 09:04:00 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-02-23 09:04:00 +0100 |
| commit | 734cdcef28540a5d9416b6dc7f77e683058daadf (patch) | |
| tree | eeb66af7278350a0589b426da9300ca29457c6bc | |
| parent | 56f3c00eec645db3a5f67afb916602cebb0325af (diff) | |
| parent | e1ecf48b8b1ba98e998253b1b57de33dbdabd485 (diff) | |
| download | volse-hubzilla-734cdcef28540a5d9416b6dc7f77e683058daadf.tar.gz volse-hubzilla-734cdcef28540a5d9416b6dc7f77e683058daadf.tar.bz2 volse-hubzilla-734cdcef28540a5d9416b6dc7f77e683058daadf.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
| -rw-r--r-- | README | 3 | ||||
| -rwxr-xr-x | include/bb2diaspora.php | 4 |
2 files changed, 2 insertions, 5 deletions
@@ -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. diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 70d4bec9a..bcef86616 100755 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -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'); |