Merge pull request #12574 from nupplaphil/feat/keyvalue_storage

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

diff --git a/src/Module/Tos.php b/src/Module/Tos.php
index 11cecac44da3d8a1510b4116016986015f6e455d..348c8c1c5f5151ba03cf55a73fbddf991d957641 100644 (file)
--- a/src/Module/Tos.php
+++ b/src/Module/Tos.php
@@ -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 = '';
                        }