Merge branch 'master' of https://github.com/vincent-peugnet/wcms

1 files changed, 13 insertions, 7 deletions

diff --git a/app/class/Modelrender.php b/app/class/Modelrender.php
index 29a3fa7..091179d 100644
--- a/app/class/Modelrender.php
+++ b/app/class/Modelrender.php
@@ -437,17 +437,23 @@ class Modelrender extends Modelpage
 			$max = 6;
 		}
 
-		$sum = [];
 		$text = preg_replace_callback(
-			'/<h([' . $min . '-' . $max . '])(\s+(\s*\w+="\w+")*)?\s*>(.+)<\/h[' . $min . '-' . $max . ']>/mU',
-			function ($matches) use (&$sum) {
-				$cleanid = idclean($matches[4]);
-				$sum[$cleanid][$matches[1]] = $matches[4];
-				return '<h' . $matches[1] . $matches[2] . ' id="' . $cleanid . '">' . $matches[4] . '</h' . $matches[1] . '>';
+			"/<h([$min-$max])((.*)id=\"([^\"]*)\"(.*)|.*)>(.+)<\/h[$min-$max]>/mU",
+			function ($matches) {
+				$level = $matches[1];
+				$beforeid = $matches[3];
+				$id = $matches[4];
+				$afterid = $matches[5];
+				$content = $matches[6];
+				// if no custom id is defined, use idclean of the content as id
+				if (empty($id)) {
+					$id = idclean($content);
+				}
+				$this->sum[] = new Header($id, intval($level), $content);
+				return "<h$level $beforeid id=\"$id\" $afterid>$content</h$level>";
 			},
 			$text
 		);
-		$this->sum[$element] = $sum;
 		return $text;
 	}