Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-04 07:45:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.110.11

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-01-13 00:45:16 +01:00
parent 2b4bf92a45
commit be6449b070
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -122,13 +122,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.110.10 (2016-01-13)"
#define Log_PLATFORM_VERSION "SWAD 15.110.11 (2016-01-13)"
#define CSS_FILE "swad15.110.2.css"
#define JS_FILE "swad15.107.2.js"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/*
Version 15.110.11:Jan 13, 2016 Fixed bug in social timeline. (192403 lines)
Version 15.110.10:Jan 13, 2016 New temporary tables used to optimize querying timeline. (192398 lines)
Version 15.110.9: Jan 12, 2016 Do not get social notes already present in timeline. (192388 lines)
Version 15.110.8: Jan 12, 2016 Insert social notes in current social timeline in database.

16
swad_social.c
View File

@ -64,9 +64,12 @@
typedef enum
{
Soc_GET_RECENT_TIMELINE,
Soc_GET_ONLY_NEW_PUBS,
Soc_GET_ONLY_OLD_PUBS,
Soc_GET_RECENT_TIMELINE, // Recent timeline is shown when user clicks on action menu,...
// or after editing timeline
Soc_GET_ONLY_NEW_PUBS, // New publishings are retrieved via AJAX
// automatically from time to time
Soc_GET_ONLY_OLD_PUBS, // Old publishings are retrieved via AJAX
// when user clicks on link at bottom of timeline
} Soc_WhatToGetFromTimeline_t;
static const Act_Action_t Soc_DefaultActions[Soc_NUM_NOTE_TYPES] =
@ -373,6 +376,10 @@ static void Soc_BuildQueryToGetTimelineGbl (Soc_WhatToGetFromTimeline_t WhatToGe
long LastPubCod;
long FirstPubCod;
/***** Clear social timeline for this session in database *****/
if (WhatToGetFromTimeline == Soc_GET_RECENT_TIMELINE)
Soc_ClearTimelineForThisSession ();
/***** Drop temporary tables *****/
Soc_DropTemporaryTablesUsedToQueryTimeline ();
@ -564,9 +571,6 @@ static void Soc_ShowTimeline (const char *Query,const char *Title)
struct SocialNote SocNot;
bool AlreadyWasInTimeline;
/***** Clear social timeline for this session in database *****/
Soc_ClearTimelineForThisSession ();
/***** Get publishings from database *****/
NumPubsGot = DB_QuerySELECT (Query,&mysql_res,"can not get timeline");