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

Fix: Removed warnings

Browse Source
This commit is contained in:
Laurent Destailleur
2012-03-03 16:44:05 +01:00
parent 2772d1dfa2
commit 6d8c1bf7c6
3 changed files with 26 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/conf.class.php
View File

@@ -163,8 +163,8 @@ class Conf
$modulename = strtolower($reg[1]);
$partname = strtolower($reg[2]);
$varname = $partname.'_modules'; // TODO deprecated
if (! is_array($this->$varname)) { $this->$varname = array(); } // TODO deprecated
if (! is_array($this->modules_parts[$partname])) { $this->modules_parts[$partname] = array(); }
if (! isset($this->$varname) || ! is_array($this->$varname)) { $this->$varname = array(); } // TODO deprecated
if (! isset($this->modules_parts[$partname]) || ! is_array($this->modules_parts[$partname])) { $this->modules_parts[$partname] = array(); }
$arrValue = dol_json_decode($value,true);
if (is_array($arrValue) && ! empty($arrValue)) $value = $arrValue;
else if (in_array($partname,array('login','menus','triggers'))) $value = '/'.$modulename.'/core/'.$partname.'/';

2
htdocs/core/lib/functions.lib.php
View File

@@ -166,7 +166,7 @@ function dol_json_encode($elements)
function dol_json_decode($json, $assoc=false)
{
$out='';
$out = unserialize($json); // For compatibility, test if serialized
$out = @unserialize($json); // For compatibility, test if serialized
if (empty($out)) $out = json_decode($json, $assoc);
return $out;
}

30
htdocs/install/upgrade2.php
View File

@@ -3501,36 +3501,6 @@ function migrate_reload_modules($db,$langs,$conf)
$mod->init('noboxes');
}
}
if (! empty($conf->global->MAIN_MODULE_PHENIX))
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Phenix");
$res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modPhenix.class.php');
if ($res) {
$mod=new modPhenix($db);
$mod->remove('noboxes');
$mod->init();
}
}
if (! empty($conf->global->MAIN_MODULE_WEBCALENDAR))
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Webcalendar");
$res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modWebcalendar.class.php');
if ($res) {
$mod=new modWebcalendar($db);
$mod->remove('noboxes');
$mod->init();
}
}
if (! empty($conf->global->MAIN_MODULE_MANTIS))
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Mantis");
$res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modMantis.class.php');
if ($res) {
$mod=new modMantis($db);
$mod->remove('noboxes');
$mod->init();
}
}
if (! empty($conf->global->MAIN_MODULE_SOCIETE))
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Societe");