diff options
author | friendica <info@friendica.com> | 2012-02-23 00:30:17 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2012-02-23 00:30:17 -0800 |
commit | d9e9fd0359cb89416b486cbe9cb65f586abe6cd9 (patch) | |
tree | 5d033d619df1983226d5270decd2f64dd0d55326 /include | |
parent | fd43e2c563679a98ad31e1a09a05bef6bb448677 (diff) | |
parent | 734cdcef28540a5d9416b6dc7f77e683058daadf (diff) | |
download | volse-hubzilla-d9e9fd0359cb89416b486cbe9cb65f586abe6cd9.tar.gz volse-hubzilla-d9e9fd0359cb89416b486cbe9cb65f586abe6cd9.tar.bz2 volse-hubzilla-d9e9fd0359cb89416b486cbe9cb65f586abe6cd9.zip |
Merge branch 'master' into notify
Diffstat (limited to 'include')
-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'); |