# keep either login or logout parts depending on user level
global $User;
- $hideclass = $User && $User->login ? 'logout' : 'login';
+ $hideclass = $User && property_exists($User, 'login') && $User->login ? 'logout' : 'login';
$doc = preg_replace('{\s*<([a-z]+) class="'.$hideclass.'">.*?</\1>}s', '', $doc);
return preg_replace_callback(
- '{ (?<! <!--BLOCK: ) \[\[ ([^] ]+) ([^]]*) \]\] }x',
+ '{ \[\[ ([^] ]+) ([^]]*) \]\] }x',
function ($sub) use ($blocks) {
list ($placeholder, $name, $params) = $sub;
- if (isset($blocks[$name])) {
- $html = $blocks[$name];
+ $html = $blocks[$name] ??
+ placeholder_include($name, explode(' ', $params));
+ if (empty($html) or $html[0] != '<') {
+ $html = "<span>$html</span>";
}
- else {
- $html = placeholder_include($name, explode(' ', $params));
- }
- return sprintf('<!--BLOCK:%s-->%s<!--/-->',
- is_numeric($name) ? '' : $placeholder, # edit replacement
- preg_replace('{<!--[^-]*-->}', '', $html) # contents
- );
+ $attr = sprintf(' data-dyn="%s"', is_numeric($name) ? '' : $name.$params);
+ # contents with identifier in first tag
+ return preg_replace( '/(?=>)/', $attr, $html, 1);
},
$doc
);
global $User, $Page, $Args;
http_response_code(500);
if (!isset($Article)) {
+ require_once('article.inc.php');
$Article = new ArchiveArticle(NULL);
$Article->title = 'Fout';
}