diff --git a/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php b/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php index f4f6a637d..af86e4465 100644 --- a/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php +++ b/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php @@ -21,6 +21,7 @@ namespace Combodo\iTop\Application\UI\Base\Component\PopoverMenu\NewsroomMenu; use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu; +use MetaModel; /** * Class NewsroomMenu @@ -65,4 +66,15 @@ class NewsroomMenu extends PopoverMenu { return json_encode($this->aParams); } + + /** + * Check if there is any Newsroom provider configured + * @since 3.1.0 N°5619 + * @return boolean + */ + public static function HasProviders(): bool + { + $aProviders = MetaModel::EnumPlugins('iNewsroomProvider'); + return count($aProviders) > 0; + } } \ No newline at end of file diff --git a/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php b/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php index efc147361..1b11b869d 100644 --- a/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php +++ b/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php @@ -49,16 +49,6 @@ class NewsroomMenuFactory return $oMenu; } - /** - * Check if there is any Newsroom provider configured - * @return boolean - */ - public static function HasProviders() - { - $aProviders = MetaModel::EnumPlugins('iNewsroomProvider'); - return count($aProviders) > 0; - } - /** * Prepare parameters for the newsroom JS widget * diff --git a/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php b/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php index 7793016bb..c2b572ab4 100644 --- a/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php +++ b/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php @@ -35,7 +35,6 @@ use MetaModel; use UIExtKeyWidget; use UserRights; use utils; -use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\NewsroomMenu\NewsroomMenuFactory; /** * Class NavigationMenu @@ -270,7 +269,7 @@ class NavigationMenu extends UIBlock implements iKeyboardShortcut */ public function IsNewsroomEnabled(): bool { - return (MetaModel::GetConfig()->Get('newsroom_enabled') && NewsroomMenuFactory::HasProviders()); + return (MetaModel::GetConfig()->Get('newsroom_enabled') && NewsroomMenu::HasProviders()); } /** diff --git a/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenuFactory.php b/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenuFactory.php index 513ca903b..f66ba171c 100644 --- a/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenuFactory.php +++ b/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenuFactory.php @@ -21,6 +21,7 @@ namespace Combodo\iTop\Application\UI\Base\Layout\NavigationMenu; use ApplicationContext; +use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\NewsroomMenu\NewsroomMenu; use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\NewsroomMenu\NewsroomMenuFactory; use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuFactory; use MetaModel; @@ -48,7 +49,7 @@ class NavigationMenuFactory { $oNewsroomMenu = null; - if (MetaModel::GetConfig()->Get('newsroom_enabled') && NewsroomMenuFactory::HasProviders()) + if (MetaModel::GetConfig()->Get('newsroom_enabled') && NewsroomMenu::HasProviders()) { $oNewsroomMenu = NewsroomMenuFactory::MakeNewsroomMenuForNavigationMenu(); }