aboutsummaryrefslogtreecommitdiff
path: root/pmwiki.php
diff options
context:
space:
mode:
authorpetko <petko@524c5546-5005-0410-9a3e-e25e191bd360>2023-07-18 16:14:41 +0000
committerpetko <petko@524c5546-5005-0410-9a3e-e25e191bd360>2023-07-18 16:14:41 +0000
commit8d707f9030f7cf5154f7c9b77ecd2b09f72444d8 (patch)
tree9342650a78e0031a7c4aa0875d36e9e55f8440d5 /pmwiki.php
parent645a429a9938f3c688e95b62475c2b82de28f19d (diff)
downloadpmwiki.svn-8d707f9030f7cf5154f7c9b77ecd2b09f72444d8.tar.bz2
Fix pagelist when 2+ directives on the same line, reported by Simon.
git-svn-id: svn://pmwiki.org/pmwiki/trunk@4483 524c5546-5005-0410-9a3e-e25e191bd360
Diffstat (limited to 'pmwiki.php')
-rw-r--r--pmwiki.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/pmwiki.php b/pmwiki.php
index ddfe8c9e..c7c50c0a 100644
--- a/pmwiki.php
+++ b/pmwiki.php
@@ -2389,7 +2389,7 @@ function MarkupToHTML($pagename, $text, $opt = NULL) {
elseif (strstr($x,$p)!==false) $x=eval($r);
if (isset($php_errormsg)) ### TODO: $php_errormsg removed since PHP 8
{ echo "ERROR: pat=$p $php_errormsg"; unset($php_errormsg); }
- if ($RedoMarkupLine) { $lines=array_merge((array)$x,$lines); continue 2; }
+ if ($RedoMarkupLine) { $lines=array_merge((array)$x,$lines); $MarkupToHTML['markupid'] = $id; continue 2; }
}
if ($x>'') $out .= "$x\n";
}
@@ -2398,7 +2398,7 @@ function MarkupToHTML($pagename, $text, $opt = NULL) {
StopWatch('MarkupToHTML end');
return $out;
}
-
+
function HandleBrowse($pagename, $auth = 'read') {
# handle display of a page
global $DefaultPageTextFmt, $PageNotFoundHeaderFmt, $HTTPHeaders,