From 087c3cdcd88e304e7cf2c9939a83f4a6b9b504d6 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 23 Jan 2020 09:13:31 -0500 Subject: [PATCH] Remove duplicated TOC loop in Module\Help --- src/Module/Help.php | 46 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/src/Module/Help.php b/src/Module/Help.php index fb31a30eed..f5e1edd747 100644 --- a/src/Module/Help.php +++ b/src/Module/Help.php @@ -66,34 +66,32 @@ class Help extends BaseModule $idNum = [0, 0, 0, 0, 0, 0, 0]; foreach ($lines as &$line) { $matches = []; - foreach ($lines as &$line) { - if (preg_match('#([^<]+?)#i', $line, $matches)) { - $level = $matches[1]; - $anchor = urlencode($matches[2]); - if ($level < $lastLevel) { - for ($k = $level; $k < $lastLevel; $k++) { - $toc .= ""; - } - - for ($k = $level + 1; $k < count($idNum); $k++) { - $idNum[$k] = 0; - } + if (preg_match('#([^<]+?)#i', $line, $matches)) { + $level = $matches[1]; + $anchor = urlencode($matches[2]); + if ($level < $lastLevel) { + for ($k = $level; $k < $lastLevel; $k++) { + $toc .= ""; } - if ($level > $lastLevel) { - $toc .= "
    • "; + for ($k = $level + 1; $k < count($idNum); $k++) { + $idNum[$k] = 0; } - - $idNum[$level] ++; - - $href = DI::baseUrl()->get() . "/help/{$filename}#{$anchor}"; - $toc .= "
    • " . strip_tags($line) . "
    • "; - $id = implode("_", array_slice($idNum, 1, $level)); - $line = "" . $line; - $line = "" . $line; - - $lastLevel = $level; } + + if ($level > $lastLevel) { + $toc .= "
      • "; + } + + $idNum[$level] ++; + + $href = DI::baseUrl()->get() . "/help/{$filename}#{$anchor}"; + $toc .= "
      • " . strip_tags($line) . "
      • "; + $id = implode("_", array_slice($idNum, 1, $level)); + $line = "" . $line; + $line = "" . $line; + + $lastLevel = $level; } }