On 2/25/15, aspect <asp...@abstracted-spleen.org> wrote:
>
> Looks like %W is used instead of %w in rendering checkin comments. Any
> checkin comment containing the character '<' will be rendered
> incorrectly.
>
> This patch (against b0febccc4e) cleans it up and corrects the comment
> in printf.c. Hope it formats correctly!

See the complete fix at https://www.fossil-scm.org/fossil/info/3b92154af8d44c0e

>
>
>
> Index: src/info.c
> ==================================================================
> --- src/info.c
> +++ src/info.c
> @@ -598,14 +598,14 @@
>       }else{
>         @ <tr><th>User:</th><td>
>         hyperlink_to_user(zUser,zDate,"</td></tr>");
>       }
>       if( zEComment ){
> -      @ <tr><th>Edited&nbsp;Comment:</th><td
> class="infoComment">%!w(zEComment)</td></tr>
> -      @ <tr><th>Original&nbsp;Comment:</th><td
> class="infoComment">%!w(zComment)</td></tr>
> +      @ <tr><th>Edited&nbsp;Comment:</th><td
> class="infoComment">%!W(zEComment)</td></tr>
> +      @ <tr><th>Original&nbsp;Comment:</th><td
> class="infoComment">%!W(zComment)</td></tr>
>       }else{
> -      @ <tr><th>Comment:</th><td
> class="infoComment">%!w(zComment)</td></tr>
> +      @ <tr><th>Comment:</th><td
> class="infoComment">%!W(zComment)</td></tr>
>       }
>       if( g.perm.Admin ){
>         db_prepare(&q2,
>            "SELECT rcvfrom.ipaddr, user.login, datetime(rcvfrom.mtime)"
>            "  FROM blob JOIN rcvfrom USING(rcvid) LEFT JOIN user
> USING(uid)"
>
> Index: src/printf.c
> ==================================================================
> --- src/printf.c
> +++ src/printf.c
> @@ -206,12 +206,12 @@
>  /*
>  ** Return an appropriate set of flags for wiki_convert() for displaying
>  ** comments on a timeline.  These flag settings are determined by
>  ** configuration parameters.
>  **
> -** The altForm2 argument is true for "%!w" (with the "!" alternate-form-2
> -** flags) and is false for plain "%w".  The ! indicates that the text is
> +** The altForm2 argument is true for "%!W" (with the "!" alternate-form-2
> +** flags) and is false for plain "%W".  The ! indicates that the text is
>  ** to be rendered on a form rather than the timeline and that block markup
>  ** is acceptable even if the "timeline-block-markup" setting is false.
>  */
> static int wiki_convert_flags(int altForm2){ static int wikiFlags = 0;
>
>
> _______________________________________________
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>


-- 
D. Richard Hipp
d...@sqlite.org
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to