FR translation of various addons updated

[friendica-addons.git] / langfilter / langfilter.php

diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index c75a07b507a6da337b71060acfd6c36ff9342b01..fe4cb5ea6d60233ff31104b2d4130be23ceb971f 100644 (file)
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -67,7 +67,7 @@ function langfilter_addon_settings(App $a, array &$data)
  * 3rd save the settings to the DB for later usage
  */
 
-function langfilter_addon_settings_post(App $a, &$b)
+function langfilter_addon_settings_post(App $a, array &$b)
 {
        if (!local_user()) {
                return;
@@ -119,11 +119,13 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data)
                return;
        }
 
-       if (!empty($hook_data['item']['rendered-html'])) {
-               $naked_body = strip_tags($hook_data['item']['rendered-html']);
-       } else {
-               $naked_body = BBCode::toPlaintext($hook_data['item']['body'], false);
-       }
+       $naked_body = strip_tags(
+               $hook_data['item']['rendered-html']
+               ??''?: // Equivalent of !empty()
+               BBCode::convert($hook_data['item']['body'], false, BBCode::ACTIVITYPUB, true)
+       );
+
+       $naked_body = preg_replace('#\s+#', ' ', trim($naked_body));
 
        // Don't filter if body lenght is below minimum
        $minlen = DI::pConfig()->get(local_user(), 'langfilter', 'minlength', 32);