Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Not error when migrating from version using exotic menu manager.

Browse Source 
Fix: Delete of member use id
This commit is contained in:
Laurent Destailleur
2013-05-12 15:25:12 +02:00
parent dbb0fa09ff
commit 7c543d0c2a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/adherents/class/adherent.class.php
View File

@@ -690,6 +690,9 @@ class Adherent extends CommonObject
$error=0; $error=0;
$errorflag=0; $errorflag=0;
// Check parameters
if (empty($rowid)) $rowid=$this->id;
$this->db->begin(); $this->db->begin();
// Remove category // Remove category

4
htdocs/main.inc.php
View File

@@ -823,9 +823,9 @@ if (! defined('NOREQUIREMENU'))
foreach($dirmenus as $dirmenu) foreach($dirmenus as $dirmenu)
{ {
$menufound=dol_include_once($dirmenu."standard/".$file_menu); $menufound=dol_include_once($dirmenu."standard/".$file_menu);
if ($menufound) break; if (class_exists('MenuManager')) break;
} }
if (! $menufound) // If failed to include, we try with standard if (! class_exists('MenuManager')) // If failed to include, we try with standard eldy_menu.php
{ {
dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING); dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
$file_menu='eldy_menu.php'; $file_menu='eldy_menu.php';