Skip to content

Commit

Permalink
Item10814: protect quotes in summary
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.foswiki.org/trunk/BlogAddOn@11806 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
ArthurClemens authored and ArthurClemens committed May 31, 2011
1 parent bb8cdd6 commit 43a8b66
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions data/System/BlogAddOn.txt
Expand Up @@ -256,6 +256,7 @@ To update the instructions on this page to point to your blog web, enter the nam
| Version: | %$VERSION% |
| Release: | %$RELEASE% |
| Change&nbsp;History: | <!-- specify latest version first -->&nbsp; |
| 31 May 2011 | 1.9.1 Encodes quotes in displayed summary text. |
| 26 Feb 2011 | 1.9.0 Added setting =outline= to control the summary text. Added form field !SummmaryImage to choose the attachment name to be displayed in the summary. Improved display of comments in list view. Added options to define image sizes. |
| 24 Feb 2011 | 1.8.0 Added settings =BLOGADDON_HIDE_COMMENTS= and =BLOGADDON_DENY_COMMENTING=. Foswikitask:Item10407 - now saves comments to the correct web if =BLOGADDON_COMMENTS_WEB= is set. Fixes tag links in blog post. |
| 24 Feb 2011 | 1.7.0 Fixed sorting on dates. Added =INCLUDE= param =display= instead of =section=. Added setting =BLOGADDON_COMMENTS_WEB=. Documentation update. Foswikitask:Item10378 - make sure the existing value of Category field is not lost. |
Expand Down
4 changes: 2 additions & 2 deletions data/_BlogAddOn/BlogPost.txt
Expand Up @@ -191,7 +191,7 @@ label="%MAKETEXT{"Last modified"}%"
<!-- title of selected category -->
%IF{"(defined pcategory) OR (defined pauthor) OR (defined tag)" then="$percntINCLUDE{$quot%TOPIC%$quot section=$quotfilters$quot}$percnt"}%%STARTSECTION{"list"}%%SEARCH{
type="query"
"BlogPostForm%IF{"defined pcategory and $pcategory!=''" then=" AND fields[name='Category'].value='%pcategory%'"}%%IF{"defined ptag and $ptag!=''" then="%FORMAT{
"form.name='BlogPostForm'%IF{"defined pcategory and $pcategory!=''" then=" AND fields[name='Category'].value='%pcategory%'"}%%IF{"defined ptag and $ptag!=''" then="%FORMAT{
type="string"
"%ptag%"
format=" AND fields[name='Tags'].value=~'\b$item\b' "
Expand Down Expand Up @@ -369,7 +369,7 @@ then="$percntINCLUDE{$quot%WEB%.BlogPost$quot section=$quotblogPostAuthorPicture
<!-- author, category, tags -->
<div class='blogPostAddOnHeaderInfo foswikiUnvisited'>$percntINCLUDE{$quot%WEB%.%TOPIC%$quot section=$quotblogPostInfo$quot web=$quot$web$quot topic=$quot$topic$quot author=$quot$formfield(Author)$quot}$percnt</div>
<!-- summary -->
<div class='blogPostAddOnSummary$percntIF{$quot'$formfield(SummaryImage)'!=''$quot then=$quot blogPostAddOnHasSummaryImage$quot}$percnt'>$percntIF{$quot'$formfield(SummaryImage)'!=''$quot then=$quot$percntINCLUDE{$quot%WEB%.%TOPIC%$quot section=$quotsummaryPicture$quot imgWeb=$quot$web$quot imgTopic=$quot$topic$quot imgName=$quot$formfield(SummaryImage)$quot}$percnt$quot}$percnt<div class='blogPostAddOnSummaryText'><div class='foswikiGrayText'>$percntIF{$quot'$%poutline%'!=''$quot then=$quot$%poutline%$quot else=$quot$%pdefaultoutline%$quot}$percnt</div>$percntSEARCH{$quot$topicComments%IF{"($WIKINAME = '%BLOGADDON_HIDE_COMMENTS%') OR (($WIKINAME ingroup '%BLOGADDON_HIDE_COMMENTS%')" then="n0nEToP1C"}%$quot web=$quot%IF{"defined BLOGADDON_COMMENTS_WEB and $BLOGADDON_COMMENTS_WEB!=''" then="%BLOGADDON_COMMENTS_WEB%" else="$web"}%$quot scope=$quottopic$quot nonoise=$quoton$quot format=$quot<ul class='blogPostAddOnCommentStatus'>
<div class='blogPostAddOnSummary$percntIF{$quot'$formfield(SummaryImage)'!=''$quot then=$quot blogPostAddOnHasSummaryImage$quot}$percnt'>$percntIF{$quot'$formfield(SummaryImage)'!=''$quot then=$quot$percntINCLUDE{$quot%WEB%.%TOPIC%$quot section=$quotsummaryPicture$quot imgWeb=$quot$web$quot imgTopic=$quot$topic$quot imgName=$quot$formfield(SummaryImage)$quot}$percnt$quot}$percnt<div class='blogPostAddOnSummaryText'><div class='foswikiGrayText'>$percntIF{$quot'%poutline%'!=''$quot then=$quot$percntENCODE{$quot$%poutline%$quot type=$quotquote$quot}$percnt$quot else=$quot$percntENCODE{$quot$%pdefaultoutline%$quot type=$quotquote$quot}$percnt$quot}$percnt</div>$percntSEARCH{$quot$topicComments%IF{"($WIKINAME = '%BLOGADDON_HIDE_COMMENTS%') OR (($WIKINAME ingroup '%BLOGADDON_HIDE_COMMENTS%')" then="n0nEToP1C"}%$quot web=$quot%IF{"defined BLOGADDON_COMMENTS_WEB and $BLOGADDON_COMMENTS_WEB!=''" then="%BLOGADDON_COMMENTS_WEB%" else="$web"}%$quot scope=$quottopic$quot nonoise=$quoton$quot format=$quot<ul class='blogPostAddOnCommentStatus'>
<li><div class='blogPostAddOnCommentStatusText'>Comments: $dollarcount(.*?(#CommentDate).*)</div></li><li>$dollarpercntIF{$dollarquot(defined BLOGADDON_AUTHOR_PICTURE_FIELD and $BLOGADDON_AUTHOR_PICTURE_FIELD!='') AND (istopic '$dollarwikiusername')$dollarquot then=$dollarquot$percntINCLUDE{$quot%TOPIC%$quot section=$quotblogPostAuthorPicture$quot imgTopic=$quot$dollarwikiusername$quot imgWeb=$quot%USERSWEB%$quot imgWidth=$quot%ppicsizecommenter%$quot}$percnt$dollarquot}$dollarpercnt<div class='blogPostAddOnCommentStatusText'><a href='$percntSCRIPTURL{view}$percnt/$web/$topic?r=$dollarrev#BlogPostPrompt'>Latest comment by $percntSPACEOUT{$quot<nop>$dollarwikiname$quot}$percnt</a><span class='foswikiGrayText'> - $dollardate</span></div></li></ul>$quot}$percnt</div></div>
</div><div class='foswikiClear'></div></div>%ENDSECTION{"blogPostAddOnItem"}%

Expand Down

0 comments on commit 43a8b66

Please sign in to comment.