Merge pull request #12921 from HankG/add-visibility-data-to-mastodon-status

[friendica.git] / src / Module / Tos.php

diff --git a/src/Module/Tos.php b/src/Module/Tos.php
index 11cecac44da3d8a1510b4116016986015f6e455d..af64810086b77cbc4016ba2601f7222b00f73b09 100644 (file)
--- a/src/Module/Tos.php
+++ b/src/Module/Tos.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -83,13 +83,15 @@ class Tos extends BaseModule
 
                $tpl = Renderer::getMarkupTemplate('tos.tpl');
                if ($this->config->get('system', 'tosdisplay')) {
-                       $lines = $this->config->get('system', 'tosrules');
-                       if (!empty($lines)) {
-                               $rules = "[list=1]";
+                       $lines = trim($this->config->get('system', 'tosrules') ?: '');
+                       if ($lines) {
+                               $rules = "[ol]";
                                foreach (explode("\n", $lines) as $line) {
-                                       $rules .= "\n[*]" . $line;
+                                       if (trim($line)) {
+                                               $rules .= "\n[*]" . trim($line);
+                                       }
                                }
-                               $rules .= "\n[/list]\n";
+                               $rules .= "\n[/ol]\n";
                        } else {
                                $rules = '';
                        }