diff options
| author | Michael <icarus@dabo.de> | 2012-02-23 20:53:22 +0100 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-02-23 20:53:22 +0100 |
| commit | 0409b5cdba003b6ce90d5ad0181e81c06af95ab1 (patch) | |
| tree | c677adb7c0e8140bdb1e115a95d1aa23fdf734ed /include/bb2diaspora.php | |
| parent | 311e35731c52102cbce3befc6343f179080ad38c (diff) | |
| parent | 8cacff69858c2ad097bafb80c93405e79c311edf (diff) | |
| download | volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.tar.gz volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.tar.bz2 volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.zip | |
Merge remote branch 'upstream/master'
Conflicts:
include/bbcode.php
Diffstat (limited to 'include/bb2diaspora.php')
| -rwxr-xr-x | include/bb2diaspora.php | 4 |
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'); |