Merge pull request #552 from annando/master

[friendica.git] / mod / parse_url.php

diff --git a/mod/parse_url.php b/mod/parse_url.php
index 9adee8f65cd8d7d9c261f6d16522ea2ed0859cd9..400c248e05d5fd5961f80842449c315caf545f74 100644 (file)
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -239,6 +239,9 @@ function parse_url_content(&$a) {
        if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
                $textmode = true;
 
+       if(local_user() && (! feature_enabled(local_user(),'richtext')))
+               $textmode = true;
+
        //if($textmode)
        $br = (($textmode) ? "\n" : '<br />');