aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2012-02-23 09:04:00 +0100
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2012-02-23 09:04:00 +0100
commit734cdcef28540a5d9416b6dc7f77e683058daadf (patch)
treeeeb66af7278350a0589b426da9300ca29457c6bc /include
parent56f3c00eec645db3a5f67afb916602cebb0325af (diff)
parente1ecf48b8b1ba98e998253b1b57de33dbdabd485 (diff)
downloadvolse-hubzilla-734cdcef28540a5d9416b6dc7f77e683058daadf.tar.gz
volse-hubzilla-734cdcef28540a5d9416b6dc7f77e683058daadf.tar.bz2
volse-hubzilla-734cdcef28540a5d9416b6dc7f77e683058daadf.zip
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'include')
-rwxr-xr-xinclude/bb2diaspora.php4
1 files changed, 2 insertions, 2 deletions
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');