X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/11c30da0ff491c29301ec1a42e7873d556364c74..9d138704ddd7a77acaf825ada534fb9a842323f2:/page.php

diff --git a/page.php b/page.php
index dd629fd..9c88e79 100644
--- a/page.php
+++ b/page.php
@@ -10,7 +10,7 @@ function abort($body, $status = NULL) {
 
 function placeholder_include($name, $params = [])
 {
-	$path = "$name.php";
+	$path = stream_resolve_include_path("$name.php");
 	if (!file_exists($path)) {
 		return '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
 	}
@@ -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])) {