diff --git a/CommentPlugin/data/Sandbox/CommentPluginExamples.txt b/CommentPlugin/data/Sandbox/CommentPluginExamples.txt index 1834b18b5d..982f03453b 100644 --- a/CommentPlugin/data/Sandbox/CommentPluginExamples.txt +++ b/CommentPlugin/data/Sandbox/CommentPluginExamples.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1494870493" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1494874118" format="1.1" version="1"}% * Top comment output 2 -- %USERSWEB%.ProjectContributor - 26 Nov 2006 * Top comment output 1 -- %USERSWEB%.ProjectContributor - 26 Nov 2006 @@ -198,7 +198,7 @@ Post to a different topic and return to here. In this example comments are writt _Comments:_
-%INCLUDE{%COMMENT_TOPIC%}% +%INCLUDE{"%COMMENT_TOPIC%"}%
--- diff --git a/EmptyPlugin/lib/Foswiki/Plugins/EmptyPlugin.pm b/EmptyPlugin/lib/Foswiki/Plugins/EmptyPlugin.pm index 46e34cf3a4..0ac7654e91 100644 --- a/EmptyPlugin/lib/Foswiki/Plugins/EmptyPlugin.pm +++ b/EmptyPlugin/lib/Foswiki/Plugins/EmptyPlugin.pm @@ -26,7 +26,7 @@ webserver error log. The ENVironment setting =$ENV{FOSWIKI_ASSERTS}= setting ma Foswiki less tolerant of errors, and it is recommended to set it during development. It can be set by editing =bin/LocalLib.cfg=, (If missing, see =bin/LocalLib.cfg.txt=) Most handlers can also throw exceptions (e.g. -[[%SCRIPTURL{view}%/%SYSTEMWEB%/PerlDoc?module=Foswiki::OopsException][Foswiki::OopsException]]) +[[%SCRIPTURL{"view"}%/%SYSTEMWEB%/PerlDoc?module=Foswiki::OopsException][Foswiki::OopsException]]) For increased performance, all handler functions except =initPlugin= are commented out below. *To enable a handler* remove the leading =#= from diff --git a/FamFamFamContrib/data/System/FamFamFamContrib.txt b/FamFamFamContrib/data/System/FamFamFamContrib.txt index cb011be956..60f98fc5eb 100644 --- a/FamFamFamContrib/data/System/FamFamFamContrib.txt +++ b/FamFamFamContrib/data/System/FamFamFamContrib.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" comment="" date="1454519814" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" comment="" date="1494874118" format="1.1" version="1"}% ---+!! !FamFamFamContrib %ENDSECTION{"changegroup"}% diff --git a/core/data/Main/WebPreferences.txt b/core/data/Main/WebPreferences.txt index af5c00519e..d5971bba3d 100644 --- a/core/data/Main/WebPreferences.txt +++ b/core/data/Main/WebPreferences.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1494206626" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1494874118" format="1.1" version="1"}% %META:TOPICPARENT{name="WebHome"}% ---+!! %WEB% Web Preferences @@ -48,4 +48,4 @@ Users or groups allowed to change or rename this %TOPIC% topic: (e.g., [[%U --- -%INCLUDE{%SYSTEMWEB%.WebPreferencesHelp}% +%INCLUDE{"%SYSTEMWEB%.WebPreferencesHelp"}% diff --git a/core/data/System/WebPreferences.txt b/core/data/System/WebPreferences.txt index acd1ca92a8..f2e678a20e 100644 --- a/core/data/System/WebPreferences.txt +++ b/core/data/System/WebPreferences.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1494206626" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1494874118" format="1.1" version="1"}% %META:TOPICPARENT{name="WebHome"}% ---+!! %WEB% Web Preferences @@ -48,4 +48,4 @@ Users or groups allowed to change or rename this %TOPIC% topic * Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup --- -%INCLUDE{%SYSTEMWEB%.WebPreferencesHelp}% +%INCLUDE{"%SYSTEMWEB%.WebPreferencesHelp"}% diff --git a/core/data/System/WebSearch.txt b/core/data/System/WebSearch.txt index 4f50a0be2b..80bf2a19a6 100644 --- a/core/data/System/WebSearch.txt +++ b/core/data/System/WebSearch.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1494815729" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1494874118" format="1.1" version="1"}% %META:TOPICPARENT{name="WebHome"}% %IF{ "$'URLPARAM{tab}'='search' OR $'URLPARAM{tab}'='' AND NOT $TAB='advanced'" @@ -36,7 +36,7 @@ %STARTSECTION{"form"}%%INCLUDE{"%TOPIC%" section="tabs"}%
-
+
@@ -80,16 +80,16 @@ %MAKETEXT{"Search"}% + }%>%MAKETEXT{"Search"}% %MAKETEXT{"Advanced search"}% + }%>%MAKETEXT{"Advanced search"}% %MAKETEXT{"A-Z"}% + }%>%MAKETEXT{"A-Z"}% %MAKETEXT{"Help"}% + }%>%MAKETEXT{"Help"}%
%ENDSECTION{"tabs"}% diff --git a/core/data/TestCases/TestCaseAutoTableInclude.txt b/core/data/TestCases/TestCaseAutoTableInclude.txt index 72408d6222..814c6ca701 100644 --- a/core/data/TestCases/TestCaseAutoTableInclude.txt +++ b/core/data/TestCases/TestCaseAutoTableInclude.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="MidBum" date="1189245567" format="1.1" reprev="1.1" version="1.1"}% +%META:TOPICINFO{author="ProjectContributor" date="1494874118" format="1.1" version="1.1"}% Description: Testcase covers Bugs:Item4439. Companion topics IncludeTableAttachment and IncludeTableNoAttachment also required. [[%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?test=compare&debugenableplugins=TestFixturePlugin&skin=pattern][run this test]] @@ -7,9 +7,9 @@ Designed by: Crawford Currie ---+ Actual -| %INCLUDE{IncludeTableAttachment}% | +| %INCLUDE{"IncludeTableAttachment"}% | -| %INCLUDE{IncludeTableNoAttachment}% | +| %INCLUDE{"IncludeTableNoAttachment"}% | ---+ Expected diff --git a/core/data/TestCases/TestCaseSaveContentWithoutEdit.txt b/core/data/TestCases/TestCaseSaveContentWithoutEdit.txt index fcc6cc0be0..c9edff9a0c 100644 --- a/core/data/TestCases/TestCaseSaveContentWithoutEdit.txt +++ b/core/data/TestCases/TestCaseSaveContentWithoutEdit.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="LynnwoodBrown" date="1124300292" format="1.1" version="1.2"}% +%META:TOPICINFO{author="ProjectContributor" date="1494874118" format="1.1" version="1.2"}% ---+!! %TOPIC% @@ -22,13 +22,13 @@ The other form fields should be unchanged. i.e.: --- The actual content is: --- -%INCLUDE{SavedContentExistingTopic}% +%INCLUDE{"SavedContentExistingTopic"}% --- *if the content is different, you need to delete SavedContentExistingTopic and "svn update" again*. ---++++ Test #1: Passing URL Params to update fields in an existing topic -If SavedContentExistingTopic %REVINFO{topic="SavedContentExistingTopic" format="r$rev"}% is not =r1=, +If SavedContentExistingTopic %REVINFO{topic="SavedContentExistingTopic" format="r$rev"}% is not =r1=, @@ -36,7 +36,7 @@ If SavedContentExistingTopic %REVINFO{topic="SavedContentExistingTopic" format=" -
+ @@ -54,7 +54,7 @@ If SavedContentExistingTopic %REVINFO{topic="SavedContentExistingTopic" format=" ---++++ Test #2: Passing URL Params to new topic with =templatetopic= specified -Before running this test, check if SavedNewTopicNoEdit exist and, if so, +Before running this test, check if SavedNewTopicNoEdit exist and, if so, @@ -64,7 +64,7 @@ Before running this test, check if SavedNewTopicNoEdit exist and, if so,
-
+ @@ -83,7 +83,7 @@ Before running this test, check if SavedNewTopicNoEdit exist and, if so, +Before running this test, check if SavedNewTopicNoEdit exists and, if so, @@ -92,7 +92,7 @@ Before running this test, check if SavedNewTopicNoEdit exists and, if so,
-
+ diff --git a/core/data/TestCases/WebLeftBar.txt b/core/data/TestCases/WebLeftBar.txt index e00886c490..1cdb298681 100644 --- a/core/data/TestCases/WebLeftBar.txt +++ b/core/data/TestCases/WebLeftBar.txt @@ -1,10 +1,10 @@ -%META:TOPICINFO{author="ProjectContributor" date="1229276996" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1494874118" format="1.1" version="1"}% %META:TOPICPARENT{name="WebHome"}% [[%SCRIPTURL{"view"}%/%WEB%/%BASETOPIC%?test=compare&debugenableplugins=TestFixturePlugin][Run Test]]
[[http://validator.w3.org/check/referer][XHTML Validator]] -%INCLUDE{CreateNewTestCaseForm}% +%INCLUDE{"CreateNewTestCaseForm"}% [[%SCRIPTURL{"changes"}%/%WEB%/][Changes]]
[[%HOMETOPIC%][%WEB%]] · [[WebTopicList][Topics]]
diff --git a/core/data/Trash/WebPreferences.txt b/core/data/Trash/WebPreferences.txt index 50daca083e..9e98a9a53c 100644 --- a/core/data/Trash/WebPreferences.txt +++ b/core/data/Trash/WebPreferences.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1281665178" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1494874118" format="1.1" version="1"}% %META:TOPICPARENT{name="WebHome"}% ---+!! %WEB% Web Preferences @@ -20,4 +20,4 @@ Restricted to adminsso that deleted topics can't be viewed by spies. --- -%INCLUDE{%SYSTEMWEB%.WebPreferencesHelp}% +%INCLUDE{"%SYSTEMWEB%.WebPreferencesHelp"}% diff --git a/core/lib/Foswiki/Configure/Bootstrap.pm b/core/lib/Foswiki/Configure/Bootstrap.pm index 0c169a2043..0ebbfb1826 100644 --- a/core/lib/Foswiki/Configure/Bootstrap.pm +++ b/core/lib/Foswiki/Configure/Bootstrap.pm @@ -640,7 +640,7 @@ out by detecting the layout of the installation. To complete the bootstrap process you should either: * Restore the missing !LocalSite.cfg from a backup, *or* * Complete the new Foswiki installation: - * visit [[%SCRIPTURL{configure}%$vp][configure]] and save a new configuration. + * visit [[%SCRIPTURL{"configure"}%$vp][configure]] and save a new configuration. * Register a user and add it to the %USERSWEB%.AdminGroup %BR% *You have been logged in as a temporary administrator.* Any requests made to this Foswiki will be treated as requests made by an administrator with full rights diff --git a/core/lib/Foswiki/IncludeHandlers/doc.pm b/core/lib/Foswiki/IncludeHandlers/doc.pm index 9e02516c05..4062f26878 100644 --- a/core/lib/Foswiki/IncludeHandlers/doc.pm +++ b/core/lib/Foswiki/IncludeHandlers/doc.pm @@ -269,7 +269,7 @@ sub _doclink ($) { # SMELL relying on TML to set publicOnly return -"[[%SCRIPTURL{view}%/%SYSTEMWEB%/PerlDoc?module=$module%IF{\"\$publicOnly = 'on'\" then=\";publicOnly=on\"}%][$title]]"; +"[[%SCRIPTURL{\"view\"}%/%SYSTEMWEB%/PerlDoc?module=$module%IF{\"\$publicOnly = 'on'\" then=\";publicOnly=on\"}%][$title]]"; } 1; diff --git a/core/lib/Foswiki/Macros/INCLUDE.pm b/core/lib/Foswiki/Macros/INCLUDE.pm index 119cbb3c9d..4d378e2456 100644 --- a/core/lib/Foswiki/Macros/INCLUDE.pm +++ b/core/lib/Foswiki/Macros/INCLUDE.pm @@ -7,9 +7,6 @@ use warnings; use Foswiki::Render; use Foswiki::Func; -# Macro takes unquoted default parameter - context-free not supported. -$Foswiki::contextFreeSyntax{INCLUDE} = 0; - BEGIN { if ( $Foswiki::cfg{UseLocale} ) { require locale; diff --git a/core/lib/Foswiki/OopsException.pm b/core/lib/Foswiki/OopsException.pm index 811a4bfbe6..9616f63e01 100644 --- a/core/lib/Foswiki/OopsException.pm +++ b/core/lib/Foswiki/OopsException.pm @@ -44,7 +44,7 @@ The =oopsbathplugin.tmpl= might contain: %TMPL:DEF{"titleaction"}% %MAKETEXT{"Bathing problem"}% %TMPL:END% %TMPL:DEF{"heading"}%%MAKETEXT{"Problem filling bath"}%%TMPL:END% %TMPL:DEF{"topicactionbuttons"}%%TMPL:P{"oktopicaction"}%%TMPL:END% -%TMPL:DEF{"script"}%%TMPL:END% +%TMPL:DEF{"script"}%%TMPL:END% %TMPL:DEF{"pagetitle"}%%TMPL:P{"heading"}%%TMPL:END% %TMPL:DEF{"webaction"}% *%MAKETEXT{"Warning"}%* %TMPL:END% %TMPL:DEF{"message"}% diff --git a/core/lib/Foswiki/UI.pm b/core/lib/Foswiki/UI.pm index 296fc1772a..33be93fe12 100644 --- a/core/lib/Foswiki/UI.pm +++ b/core/lib/Foswiki/UI.pm @@ -317,9 +317,9 @@ sub handleRequest { . ' script can only be called with the POST type method' . '

' . 'For example:
' - . '   <form method="post" action="%SCRIPTURL{' + . '   <form method="post" action="%SCRIPTURL{"' . $req->action() - . '}%/%WEB%/%TOPIC%">
' + . '"}%/%WEB%/%TOPIC%">
' . '

See System.CommandAndCGIScripts for more information.' diff --git a/core/lib/Foswiki/UI/Manage.pm b/core/lib/Foswiki/UI/Manage.pm index eb8eeb4f57..9dc50b66a0 100644 --- a/core/lib/Foswiki/UI/Manage.pm +++ b/core/lib/Foswiki/UI/Manage.pm @@ -297,7 +297,7 @@ Creates an exception when the topic name is not valid; the topic name does not h WikiWord if parameter 'onlywikiname' is set to 'off'. Redirects to the edit screen. Copy an existing topic using: - + diff --git a/core/lib/Foswiki/Users/HtPasswdUser.pm b/core/lib/Foswiki/Users/HtPasswdUser.pm index 9b54521f3c..3abcf2ad63 100644 --- a/core/lib/Foswiki/Users/HtPasswdUser.pm +++ b/core/lib/Foswiki/Users/HtPasswdUser.pm @@ -6,7 +6,7 @@ Support for htpasswd and htdigest format password files. -Subclass of =[[%SCRIPTURL{view}%/%SYSTEMWEB%/PerlDoc?module=Foswiki::Users::Password][Foswiki::Users::Password]]=. +Subclass of =[[%SCRIPTURL{"view"}%/%SYSTEMWEB%/PerlDoc?module=Foswiki::Users::Password][Foswiki::Users::Password]]=. See documentation of that class for descriptions of the methods of this class. =cut