From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 26 Nov 2018 17:28:37 +0000 (+0100)
Subject: page: prevent reparsing of placeholder blocks
X-Git-Tag: v3.8^0
X-Git-Url: http://git.shiar.nl/minimedit.git/commitdiff_plain/9d138704ddd7a77acaf825ada534fb9a842323f2

page: prevent reparsing of placeholder blocks

Quick hack to support consecutive calls of getoutput() on news pages,
ignoring the original placeholder in inserted block comments and resulting
<!--BLOCK:<!--BLOCK:[[nieuws]]-->-->… output.
---

diff --git a/page.php b/page.php
index 175c2eb..9c88e79 100644
--- a/page.php
+++ b/page.php
@@ -53,7 +53,7 @@ function getoutput($blocks = [])
 	}
 
 	return preg_replace_callback(
-		'< \[\[ ([^] ]+) ([^]]*) \]\] >x',
+		'{ (?<! <!--BLOCK: ) \[\[ ([^] ]+) ([^]]*) \]\] }x',
 		function ($sub) use ($blocks) {
 			list ($placeholder, $name, $params) = $sub;
 			if (isset($blocks[$name])) {