Trim terms of service rules before turning them to an array
This commit is contained in:
parent
9a8f6f2150
commit
43aa9cddc5
|
@ -251,7 +251,7 @@ class System
|
|||
|
||||
// Don't show multiple calls from the Database classes to show the essential parts of the callstack
|
||||
$func['database'] = in_array($func['class'], ['Friendica\Database\DBA', 'Friendica\Database\Database']);
|
||||
if (!$previous['database'] || !$func['database']) {
|
||||
if (!$previous['database'] || !$func['database']) {
|
||||
$classparts = explode("\\", $func['class']);
|
||||
$callstack[] = array_pop($classparts).'::'.$func['function'];
|
||||
$previous = $func;
|
||||
|
@ -678,7 +678,7 @@ class System
|
|||
$html = BBCode::convert($rulelist, false, BBCode::EXTERNAL);
|
||||
|
||||
$msg = HTML::toPlaintext($html, 0, true);
|
||||
foreach (explode("\n", $msg) as $line) {
|
||||
foreach (explode("\n", trim($msg)) as $line) {
|
||||
$line = trim($line);
|
||||
if ($line) {
|
||||
$rules[] = ['id' => (string)++$id, 'text' => $line];
|
||||
|
|
|
@ -83,8 +83,8 @@ class Tos extends BaseModule
|
|||
|
||||
$tpl = Renderer::getMarkupTemplate('tos.tpl');
|
||||
if ($this->config->get('system', 'tosdisplay')) {
|
||||
$lines = $this->config->get('system', 'tosrules');
|
||||
if (!empty($lines)) {
|
||||
$lines = trim($this->config->get('system', 'tosrules') ?: '');
|
||||
if ($lines) {
|
||||
$rules = "[list=1]";
|
||||
foreach (explode("\n", $lines) as $line) {
|
||||
$rules .= "\n[*]" . $line;
|
||||
|
|
Loading…
Reference in New Issue
Block a user