Merge branch 'master' into issue-2362-add-filters-options-in-admin

This commit is contained in:
Perrom
2025-06-27 10:18:00 +02:00
47 changed files with 4042 additions and 857 deletions

View File

@@ -1929,7 +1929,7 @@ function fill_lounge($images, $categories)
*/
function empty_lounge($invalidate_user_cache=true)
{
global $logger;
global $logger, $conf;
if (isset($conf['empty_lounge_running']))
{
@@ -2734,6 +2734,17 @@ function get_newsletter_subscribe_base_url($language='en_UK')
return PHPWG_URL.'/announcement/subscribe/';
}
/**
* Get url on piwigo.org for old newsletters
*
* @param string $language (unused)
* @return string
*/
function get_old_newsletters_base_url($language='en_UK')
{
return PHPWG_URL.'/newsletter';
}
/**
* Return admin menu id for accordion.
*