Skip to content

Commit

Permalink
Item14398: More quoting of unquoted macros.
Browse files Browse the repository at this point in the history
  • Loading branch information
@gac410
gac410 committed May 15, 2017
1 parent 1c690a1 commit f160a77
Show file tree
Hide file tree
Showing 16 changed files with 204 additions and 202 deletions.
2 changes: 1 addition & 1 deletion HistoryPlugin/test/unit/HistoryPlugin/HistoryPluginTests.pm
View file
Expand Up @@ -94,7 +94,7 @@ sub _getDate {
sub _getTopicUrl {
my ( $this, $topicObject ) = @_;

my $url = $topicObject->expandMacros("%SCRIPTURLPATH{view}%");
my $url = $topicObject->expandMacros("%SCRIPTURLPATH{\"view\"}%");
return $url;
}

Expand Down
4 changes: 2 additions & 2 deletions HomePagePlugin/data/System/HomePagePlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1426726301" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1494882002" format="1.1" version="1"}%
---+!! !HomePagePlugin
<!--
One line description, required for extensions repository catalog.
Expand All @@ -11,7 +11,7 @@ One line description, required for extensions repository catalog.
---++ Usage

This plugin makes the Default frontpage configurable -
1 any time a user goes to %SCRIPTURL{view}% they will be shown the topic =configured=
1 any time a user goes to %SCRIPTURL{"view"}% they will be shown the topic =configured=
by the Foswiki administrator in ={HomePagePlugin}{SiteDefaultTopic}= in the Extensions section of =configure=.
2 if ={HomePagePlugin}{GotoHomePageOnLogin}= is set, when a user logs in, they will be shown the topic specificed in their UserForm

Expand Down
84 changes: 42 additions & 42 deletions PatternSkin/data/System/PatternSkinTheme.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1437500521" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1494882002" format="1.1" version="1"}%
%META:TOPICPARENT{name="PatternSkin"}%
---+!! <nop>PatternSkin theme
Default pattern skin theme.
Expand All @@ -21,7 +21,7 @@ Default pattern skin theme.
* Local DISPLAY_PATTERNSKIN_THEME_VARIANT = %CALCULATE{"$SUBSTITUTE(%PATTERNSKIN_THEME_VARIANT%, %PUBURLPATH%/%SYSTEMWEB%, $NOP(%<nop>PUBURLPATH%/%<nop>SYSTEMWEB%))"}%
* Local DISPLAY_PATTERNSKIN_NAVIGATION_TOPIC = %CALCULATE{"$SUBSTITUTE(%PATTERNSKIN_NAVIGATION_TOPIC%, %PUBURLPATH%/%SYSTEMWEB%, $NOP(%<nop>PUBURLPATH%/%<nop>SYSTEMWEB%))"}%
-->
<form action="%SCRIPTURL{view}%/%BASEWEB%/%BASETOPIC%">
<form action="%SCRIPTURL{"view"}%/%BASEWEB%/%BASETOPIC%">
<input type="hidden" name="viewtheme" value="1" />
<input type="hidden" name="layout" value="%PUBURLPATH%/%SYSTEMWEB%/PatternSkinTheme/layout.css" />
<input type="hidden" name="style" value="%PUBURLPATH%/%SYSTEMWEB%/PatternSkinTheme/style.css" />
Expand All @@ -30,7 +30,7 @@ Default pattern skin theme.
<div class="foswikiFormStep">
---+++ Choose column
<select name="column" class="foswikiSelect">
%IF{"$'URLPARAM{column}'" then="<optgroup label='Current selection'><option value='%URLPARAM{"column"}%' selected='selected'>%URLPARAM{"column"}%</option></optgroup>"}%
%IF{"$'URLPARAM{\"column\"}'" then="<optgroup label='Current selection'><option value='%URLPARAM{"column"}%' selected='selected'>%URLPARAM{"column"}%</option></optgroup>"}%
<optgroup label='Column options:'>
<option value="%SYSTEMWEB%/PatternSkinTheme/column_left.css">Column left (default)</option>
<option value="%SYSTEMWEB%/PatternSkinTheme/column_left_flex.css">Column left, flexible width</option>
Expand All @@ -43,7 +43,7 @@ Default pattern skin theme.
<div class="foswikiFormStep">
---+++ Choose variant CSS
<select name="variant" class="foswikiSelect">
%IF{"$'URLPARAM{variant}'" then="<optgroup label='Current selection'><option value='%URLPARAM{"variant"}%' selected='selected'>%URLPARAM{"variant"}%</option></optgroup>"}%
%IF{"$'URLPARAM{\"variant\"}'" then="<optgroup label='Current selection'><option value='%URLPARAM{"variant"}%' selected='selected'>%URLPARAM{"variant"}%</option></optgroup>"}%
<optgroup label='Variant CSS options:'>
<option value="%SYSTEMWEB%/PatternSkinTheme/variant_foswiki_noframe.css">No frame (default)</option>
<option value="%SYSTEMWEB%/PatternSkinTheme/variant_foswiki_frame.css">Frame</option>
Expand All @@ -53,7 +53,7 @@ Default pattern skin theme.
<div class="foswikiFormStep">
---+++ Choose navigation
<select name="navigation" class="foswikiSelect">
%IF{"$'URLPARAM{navigation}'" then="<optgroup label='Current selection'><option value='%URLPARAM{"navigation"}%' selected='selected'>%URLPARAM{"navigation"}%</option></optgroup>"}%
%IF{"$'URLPARAM{\"navigation\"}'" then="<optgroup label='Current selection'><option value='%URLPARAM{"navigation"}%' selected='selected'>%URLPARAM{"navigation"}%</option></optgroup>"}%
<optgroup label='Navigation Topics:'>
<option value="">None</option>
<option value="%SYSTEMWEB%/PatternSkinNavigation">Default</option>
Expand All @@ -63,12 +63,12 @@ Default pattern skin theme.
</select>
</div>
<div class="foswikiFormStep">
<input type="submit" class="foswikiSubmit" value="View theme with these settings" /> <a href="%SCRIPTURLPATH{view}%/%BASEWEB%/%BASETOPIC%" class="foswikiButton">Hide theme</a>
<input type="submit" class="foswikiSubmit" value="View theme with these settings" /> <a href="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%" class="foswikiButton">Hide theme</a>
</div>
</div>
</form>

%IF{"$'URLPARAM{viewtheme}'" then='$percntINCLUDE{$quot%BASETOPIC%$quot section=$quotstoresettings$quot}$percnt'}%
%IF{"$'URLPARAM{\"viewtheme\"}'" then='$percntINCLUDE{$quot%BASETOPIC%$quot section=$quotstoresettings$quot}$percnt'}%

<verbatim class="foswikiHidden">
%STARTSECTION{"storesettings"}%
Expand All @@ -95,38 +95,38 @@ Navigation:
%ENDSECTION{"storesettings"}%
</verbatim>

%META:FILEATTACHMENT{name="popup.gif" attr="h" comment="" date="1437500521" size="63" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right_flex.css" attr="h" comment="" date="1437500521" size="285" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right.css" attr="h" comment="" date="1437500521" size="182" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_left.css" attr="h" comment="" date="1437500521" size="193" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_left_flex_src.css" attr="h" comment="" date="1437500521" size="332" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right_flex_src.css" attr="h" comment="" date="1437500521" size="510" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="variant_foswiki_noframe.css" attr="h" comment="" date="1437500521" size="153" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_none.css" attr="h" comment="" date="1437500521" size="29" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="style.css.gz" attr="h" comment="" date="1437500521" size="6387" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="colors_src.css" attr="h" comment="" date="1437500521" size="11010" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_left.css.gz" attr="h" comment="" date="1437500521" size="129" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="layout.css" attr="h" comment="" date="1437500521" size="811" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="layout.css.gz" attr="h" comment="" date="1437500521" size="413" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_left_flex.css.gz" attr="h" comment="" date="1437500521" size="124" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="style.css" attr="h" comment="" date="1437500521" size="38959" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="style_src.css" attr="h" comment="" date="1437500521" size="51751" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="variant_foswiki_noframe_src.css" attr="h" comment="" date="1437500521" size="376" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="top_bar_gradient.png" attr="h" comment="" date="1437500521" size="1703" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right_src.css" attr="h" comment="" date="1437500521" size="348" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right_flex.css.gz" attr="h" comment="" date="1437500521" size="181" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="variant_foswiki_frame.css.gz" attr="h" comment="" date="1437500521" size="155" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="bullet-personal_sidebar.gif" attr="h" comment="" date="1437500521" size="51" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_none_src.css" attr="h" comment="" date="1437500521" size="67" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="colors.css" attr="h" comment="" date="1437500521" size="8048" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="variant_foswiki_frame.css" attr="h" comment="" date="1437500521" size="206" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_none.css.gz" attr="h" comment="" date="1437500521" size="49" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="bullet-lock.gif" attr="h" comment="" date="1437500521" size="281" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="variant_foswiki_noframe.css.gz" attr="h" comment="" date="1437500521" size="121" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="colors.css.gz" attr="h" comment="" date="1437500521" size="1860" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="layout_src.css" attr="h" comment="" date="1437500521" size="1774" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="variant_foswiki_frame_src.css" attr="h" comment="" date="1437500521" size="485" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_left_flex.css" attr="h" comment="" date="1437500521" size="179" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_left_src.css" attr="h" comment="" date="1437500521" size="348" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="bullet-toc.gif" attr="h" comment="" date="1437500521" size="54" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right.css.gz" attr="h" comment="" date="1437500521" size="144" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="popup.gif" attr="h" comment="" date="1494882002" size="63" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right_flex.css" attr="h" comment="" date="1494882002" size="285" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right.css" attr="h" comment="" date="1494882002" size="182" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_left.css" attr="h" comment="" date="1494882002" size="193" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_left_flex_src.css" attr="h" comment="" date="1494882002" size="332" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right_flex_src.css" attr="h" comment="" date="1494882002" size="510" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="variant_foswiki_noframe.css" attr="h" comment="" date="1494882002" size="153" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_none.css" attr="h" comment="" date="1494882002" size="29" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="style.css.gz" attr="h" comment="" date="1494882002" size="6387" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="colors_src.css" attr="h" comment="" date="1494882002" size="11010" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_left.css.gz" attr="h" comment="" date="1494882002" size="129" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="layout.css" attr="h" comment="" date="1494882002" size="811" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="layout.css.gz" attr="h" comment="" date="1494882002" size="413" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_left_flex.css.gz" attr="h" comment="" date="1494882002" size="124" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="style.css" attr="h" comment="" date="1494882002" size="38959" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="style_src.css" attr="h" comment="" date="1494882002" size="51751" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="variant_foswiki_noframe_src.css" attr="h" comment="" date="1494882002" size="376" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="top_bar_gradient.png" attr="h" comment="" date="1494882002" size="1703" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right_src.css" attr="h" comment="" date="1494882002" size="348" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right_flex.css.gz" attr="h" comment="" date="1494882002" size="181" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="variant_foswiki_frame.css.gz" attr="h" comment="" date="1494882002" size="155" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="bullet-personal_sidebar.gif" attr="h" comment="" date="1494882002" size="51" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_none_src.css" attr="h" comment="" date="1494882002" size="67" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="colors.css" attr="h" comment="" date="1494882002" size="8048" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="variant_foswiki_frame.css" attr="h" comment="" date="1494882002" size="206" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_none.css.gz" attr="h" comment="" date="1494882002" size="49" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="bullet-lock.gif" attr="h" comment="" date="1494882002" size="281" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="variant_foswiki_noframe.css.gz" attr="h" comment="" date="1494882002" size="121" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="colors.css.gz" attr="h" comment="" date="1494882002" size="1860" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="layout_src.css" attr="h" comment="" date="1494882002" size="1774" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="variant_foswiki_frame_src.css" attr="h" comment="" date="1494882002" size="485" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_left_flex.css" attr="h" comment="" date="1494882002" size="179" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_left_src.css" attr="h" comment="" date="1494882002" size="348" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="bullet-toc.gif" attr="h" comment="" date="1494882002" size="54" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="column_right.css.gz" attr="h" comment="" date="1494882002" size="144" user="ProjectContributor" version="1"}%

0 comments on commit f160a77

Please sign in to comment.