diff --git a/swad_changelog.h b/swad_changelog.h index 4a14af644..21678f7b2 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -557,10 +557,11 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.246.2 (2020-05-25)" +#define Log_PLATFORM_VERSION "SWAD 19.246.3 (2020-05-25)" #define CSS_FILE "swad19.238.2.css" #define JS_FILE "swad19.246.1.js" /* + Version 19.246.3: May 25, 2020 Fixed bug in notices. (302529 lines) Version 19.246.2: May 25, 2020 Links to edition of tags in test and test configuration. (302518 lines) Version 19.246.1: May 25, 2020 Removed unused JavaScript code. (302515 lines) Version 19.246: May 24, 2020 Fixed issue answering exam prints: when answer is been sent, button to send exam is disabled. (302527 lines) diff --git a/swad_notice.c b/swad_notice.c index 9482b995a..76e916882 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -437,10 +437,19 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing,long HighlightNotCod) /* Get the content (row[3]) and insert links */ Str_Copy (Content,row[3], Cns_MAX_BYTES_TEXT); - Str_InsertLinks (Content,Cns_MAX_BYTES_TEXT, - Not_MaxCharsURLOnScreen[TypeNoticesListing]); - if (TypeNoticesListing == Not_LIST_BRIEF_NOTICES) - Str_LimitLengthHTMLStr (Content,Not_MAX_CHARS_ON_NOTICE); + + /* Inserting links is incompatible with limiting the length + ==> don't insert links when limiting length */ + switch (TypeNoticesListing) + { + case Not_LIST_BRIEF_NOTICES: + Str_LimitLengthHTMLStr (Content,Not_MAX_CHARS_ON_NOTICE); + break; + case Not_LIST_FULL_NOTICES: + Str_InsertLinks (Content,Cns_MAX_BYTES_TEXT, + Not_MaxCharsURLOnScreen[TypeNoticesListing]); + break; + } /* Get status of the notice (row[4]) */ Status = Not_OBSOLETE_NOTICE; @@ -778,6 +787,8 @@ void Not_GetSummaryAndContentNotice (char SummaryStr[Ntf_MAX_BYTES_SUMMARY + 1], // TODO: Do only direct copy when a Subject of type VARCHAR(255) is available if (strlen (row[0]) > Ntf_MAX_BYTES_SUMMARY) { + /* Inserting links is incompatible with limiting the length + ==> don't insert links */ strncpy (SummaryStr,row[0], Ntf_MAX_BYTES_SUMMARY); SummaryStr[Ntf_MAX_BYTES_SUMMARY] = '\0';