Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur (aka Eldy) 2025-01-19 19:05:25 +01:00
commit f6e493341f
2 changed files with 2 additions and 2 deletions

View file

@ -4149,7 +4149,7 @@ if ($action == 'editcss') {
$htmlhelp = $langs->trans('RSSFeedDesc');
print $form->textwithpicto($langs->trans('RSSFeed'), $htmlhelp, 1, 'help', '', 0, 2, '');
print '</td><td>';
print '/wrapper.php?rss=1[&l=XX][&limit=123]';
print '/wrapper.php?rss=1[&l=XX][&limit=99][&cachedelay=99]';
print '</td></tr>';
print '</table>';

View file

@ -35,6 +35,7 @@ $entity = GETPOSTINT('entity') ? GETPOSTINT('entity') : $conf->entity;
$original_file = GETPOST("file", "alpha");
$l = GETPOST('l', 'aZ09');
$limit = GETPOSTINT('limit');
$cachedelay = GETPOSTINT('cachedelay'); // The delay in second of the cache
// Parameters for RSS
$rss = GETPOST('rss', 'aZ09');
@ -115,7 +116,6 @@ $refname = basename(dirname($original_file)."/");
if ($rss) {
$format = 'rss';
$type = '';
$cachedelay = 0;
$filename = $original_file;
$dir_temp = $conf->website->dir_temp;