Fix travis errors

This commit is contained in:
Laurent Destailleur 2016-09-30 15:22:58 +02:00
parent cf12ddd659
commit d9ff53eb7f
3 changed files with 4 additions and 20 deletions

View File

@ -1552,12 +1552,14 @@ class DolibarrModules // Can not be abstract, because we need to insta
/** /**
* Adds menu entries * Adds menu entries
* *
* @return int Error count (0 if OK) * @return int Error count (0 if OK)
*/ */
function insert_menus() function insert_menus()
{ {
global $user; global $user;
if (! is_array($this->menu) || empty($this->menu)) return 0;
require_once DOL_DOCUMENT_ROOT . '/core/class/menubase.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/menubase.class.php';
$err=0; $err=0;

View File

@ -110,10 +110,6 @@ class modFTP extends DolibarrModules
// Menus // Menus
//------- //-------
$this->menu = 1; // This module add menu entries. They are coded into menu manager.
// Top menu
$this->menu[$r]=array('fk_menu'=>0, $this->menu[$r]=array('fk_menu'=>0,
'type'=>'top', 'type'=>'top',
'titre'=>'FTP', 'titre'=>'FTP',

View File

@ -121,21 +121,7 @@ class modOpenSurvey extends DolibarrModules
// Menus // Menus
//------- //-------
$this->menu = 1; // This module add menu entries. They are coded into menu manager. $r=0;
/*
$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++;*/
$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 $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', 'type'=>'left',
'titre'=>'Survey', 'titre'=>'Survey',