From d9ff53eb7f4b4d24a40bd18f29042dfafd5d75a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Sep 2016 15:22:58 +0200
Subject: [PATCH] Fix travis errors
---
htdocs/core/modules/DolibarrModules.class.php | 4 +++-
htdocs/core/modules/modFTP.class.php | 4 ----
htdocs/core/modules/modOpenSurvey.class.php | 16 +---------------
3 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 6d6856ff36b..b8b194e5be6 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1552,12 +1552,14 @@ class DolibarrModules // Can not be abstract, because we need to insta
/**
* Adds menu entries
*
- * @return int Error count (0 if OK)
+ * @return int Error count (0 if OK)
*/
function insert_menus()
{
global $user;
+ if (! is_array($this->menu) || empty($this->menu)) return 0;
+
require_once DOL_DOCUMENT_ROOT . '/core/class/menubase.class.php';
$err=0;
diff --git a/htdocs/core/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php
index 2c50d3daaf1..f22d402b979 100644
--- a/htdocs/core/modules/modFTP.class.php
+++ b/htdocs/core/modules/modFTP.class.php
@@ -110,10 +110,6 @@ class modFTP extends DolibarrModules
// Menus
//-------
- $this->menu = 1; // This module add menu entries. They are coded into menu manager.
-
-
- // Top menu
$this->menu[$r]=array('fk_menu'=>0,
'type'=>'top',
'titre'=>'FTP',
diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index 7cbfeb1e268..ea10750ad7c 100644
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -121,21 +121,7 @@ class modOpenSurvey extends DolibarrModules
// Menus
//-------
- $this->menu = 1; // This module add menu entries. They are coded into menu manager.
- /*
- $this->menu[$r]=array( 'fk_menu'=>0, // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
- 'type'=>'top',
- 'titre'=>'Surveys',
- 'mainmenu'=>'opensurvey',
- 'url'=>'/opensurvey/index.php',
- 'langs'=>'opensurvey',
- 'position'=>200,
- 'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
- 'perms'=>'$user->rights->opensurvey->read',
- 'target'=>'',
- 'user'=>0);
- $r++;*/
-
+ $r=0;
$this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
'type'=>'left',
'titre'=>'Survey',
--
GitLab