git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
foto: common override of navigation root title
[minimedit.git]
/
page.php
diff --git
a/page.php
b/page.php
index dd629fd8d4f0f869af47c8bb84515a12e34546d8..9c88e79adef63baae3a0c04efad458e186108077 100644
(file)
--- a/
page.php
+++ b/
page.php
@@
-10,7
+10,7
@@
function abort($body, $status = NULL) {
function placeholder_include($name, $params = [])
{
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>';
}
if (!file_exists($path)) {
return '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
}
@@
-53,7
+53,7
@@
function getoutput($blocks = [])
}
return preg_replace_callback(
}
return preg_replace_callback(
- '
< \[\[ ([^] ]+) ([^]]*) \]\] >
x',
+ '
{ (?<! <!--BLOCK: ) \[\[ ([^] ]+) ([^]]*) \]\] }
x',
function ($sub) use ($blocks) {
list ($placeholder, $name, $params) = $sub;
if (isset($blocks[$name])) {
function ($sub) use ($blocks) {
list ($placeholder, $name, $params) = $sub;
if (isset($blocks[$name])) {