Add ObfuscateLinkIMap() based on Cookbook:DeObMail, default disabled. GuiEdit/EditForm: Add FixUrl button based on Cookbook:FixUrl default disabled, add $EnableGuiEditFixUrl; add features from Cookbook:NotSavedWarning, default disabled, add $EnableNotSavedWarning; add scroll position to edit text area will be remembered on save-and-edit and preview; add $EnableEditAutoText and features from Cookbook:EditHelp. Add $PmTOC, (:toc:), (:notoc:), based on a simplified variant of Cookbook:AutoTOC. Fix bug with pagelist while preview, reported by Finar.

git-svn-id: svn://pmwiki.org/pmwiki/trunk@3491 524c5546-5005-0410-9a3e-e25e191bd360

1 files changed, 2 insertions, 2 deletions

diff --git a/scripts/pagelist.php b/scripts/pagelist.php
index baf9c4d7..dd59a149 100644
--- a/scripts/pagelist.php
+++ b/scripts/pagelist.php
@@ -85,7 +85,7 @@ XLSDV('en', array(
   'SearchFound' => 
     '$MatchCount pages found out of $MatchSearched pages searched.'));
 
-SDV($PageListArgPattern, '((?:\\$:?)?\\w+)[:=]');
+SDV($PageListArgPattern, '((?:\\$:?)?\\w[-\\w]*)[:=]');
 
 Markup('pagelist', 'directives',
   '/\\(:pagelist(\\s+.*?)?:\\)/i', "MarkupPageList");
@@ -232,7 +232,7 @@ function FmtPageList($outfmt, $pagename, $opt) {
   $opt = array_merge($fmtopt, $opt);
   $out = $fmtfn($pagename, $matches, $opt);
   $FmtV['$MatchCount'] = count($matches);
-  if ($outfmt != '$MatchList') 
+  if ($outfmt != '$MatchList')
     { $FmtV['$MatchList'] = $out; $out = FmtPageName($outfmt, $pagename); }
   if ($out[0] == '<') $out = Keep($out);
   return PRR($out);