Skip to content

Commit

Permalink
Standardize code
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Sep 18, 2018
1 parent 1a1219e commit 52b6dd1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions htdocs/core/class/conf.class.php
Expand Up @@ -35,12 +35,12 @@ class Conf
/** \public */
//! To store properties found in conf file
var $file;

/**
* @var DoliDB Database handler.
*/
public $db;

//! To store properties found into database
var $global;
//! To store browser info
Expand Down Expand Up @@ -182,7 +182,7 @@ function setValues($db)
if (is_array($arrValue) && ! empty($arrValue)) $value = $arrValue;
else if (in_array($partname,array('login','menus','substitutions','triggers','tpl'))) $value = '/'.$modulename.'/core/'.$partname.'/';
else if (in_array($partname,array('models','theme'))) $value = '/'.$modulename.'/';
else if (in_array($partname,array('sms'))) $value = $modulename;
else if (in_array($partname,array('sms'))) $value = '/'.$modulename.'/';
else if ($value == 1) $value = '/'.$modulename.'/core/modules/'.$partname.'/'; // ex: partname = societe
$this->modules_parts[$partname] = array_merge($this->modules_parts[$partname], array($modulename => $value)); // $value may be a string or an array
}
Expand Down

0 comments on commit 52b6dd1

Please sign in to comment.