mirror of https://github.com/acanas/swad-core.git
Version 18.14.1
This commit is contained in:
parent
6e5b810527
commit
a071b531b0
|
@ -355,10 +355,11 @@ En OpenSWAD:
|
|||
ps2pdf source.ps destination.pdf
|
||||
*/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 18.14 (2018-11-09)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 18.14.1 (2018-11-09)"
|
||||
#define CSS_FILE "swad18.4.css"
|
||||
#define JS_FILE "swad17.17.1.js"
|
||||
/*
|
||||
Version 18.14.1: Nov 09, 2018 Dixed several bugs when compiling with -Os. (236721 lines)
|
||||
Version 18.14: Nov 09, 2018 New module swad_form for forms to go to actions.
|
||||
Fixed bug in query to get assignments. (236705 lines)
|
||||
Version 18.13.7: Nov 09, 2018 Fixed bug in file browser links. (236552 lines)
|
||||
|
|
11
swad_mail.c
11
swad_mail.c
|
@ -1811,7 +1811,7 @@ void Mai_ConfirmEmail (void)
|
|||
char MailKey[Mai_LENGTH_EMAIL_CONFIRM_KEY + 1];
|
||||
long UsrCod;
|
||||
char Email[Cns_MAX_BYTES_EMAIL_ADDRESS + 1];
|
||||
bool KeyIsCorrect = false;
|
||||
bool KeyIsCorrect;
|
||||
bool Confirmed;
|
||||
|
||||
/***** Get parameter Key *****/
|
||||
|
@ -1834,6 +1834,12 @@ void Mai_ConfirmEmail (void)
|
|||
|
||||
KeyIsCorrect = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
row = NULL;
|
||||
UsrCod = -1L;
|
||||
KeyIsCorrect = false;
|
||||
}
|
||||
|
||||
/***** Free structure that stores the query result *****/
|
||||
DB_FreeMySQLResult (&mysql_res);
|
||||
|
@ -1852,6 +1858,9 @@ void Mai_ConfirmEmail (void)
|
|||
" WHERE UsrCod=%ld AND E_mail='%s'",
|
||||
UsrCod,Email))
|
||||
{
|
||||
Confirmed = false;
|
||||
if (row)
|
||||
if (row[0])
|
||||
Confirmed = (row[0][0] == 'Y');
|
||||
|
||||
/***** Confirm email *****/
|
||||
|
|
|
@ -772,7 +772,10 @@ static void Soc_BuildQueryToGetTimeline (char **Query,
|
|||
PubCod = Str_ConvertStrCodToLongCod (row[0]);
|
||||
}
|
||||
else
|
||||
{
|
||||
row = NULL;
|
||||
PubCod = -1L;
|
||||
}
|
||||
|
||||
/* Free structure that stores the query result */
|
||||
DB_FreeMySQLResult (&mysql_res);
|
||||
|
@ -785,6 +788,8 @@ static void Soc_BuildQueryToGetTimeline (char **Query,
|
|||
RangePubsToGet.Top = PubCod; // Narrow the range for the next iteration
|
||||
|
||||
/* Get social note code (row[1]) */
|
||||
if (row)
|
||||
{
|
||||
NotCod = Str_ConvertStrCodToLongCod (row[1]);
|
||||
DB_QueryINSERT ("can not store note code",
|
||||
"INSERT INTO not_codes SET NotCod=%ld",
|
||||
|
@ -793,6 +798,7 @@ static void Soc_BuildQueryToGetTimeline (char **Query,
|
|||
"INSERT INTO current_timeline SET NotCod=%ld",
|
||||
NotCod);
|
||||
}
|
||||
}
|
||||
else // Nothing got ==> abort loop
|
||||
break; // Last publishing
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue