Skip to content

Commit

Permalink
Fix scrutinizer warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Jun 18, 2019
1 parent f3703c8 commit 525598f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
8 changes: 4 additions & 4 deletions htdocs/adherents/class/adherent.class.php
Expand Up @@ -183,14 +183,14 @@ class Adherent extends CommonObject
* @var integer
*/
public $datec;

/**
* Date modification record (tms)
*
* @var integer
*/
public $datem;

public $datevalid;

public $gender;
Expand Down Expand Up @@ -1268,7 +1268,7 @@ public function fetch($rowid, $ref = '', $fk_soc = '', $ref_ext = '', $fetch_opt
$this->ref = $obj->rowid;
$this->id = $obj->rowid;
$this->ref_ext = $obj->ref_ext;

$this->civility_id = $obj->civility_code; // Bad. Kept for backard compatibility
$this->civility_code = $obj->civility_code;
$this->civility = $obj->civility_code?($langs->trans("Civility".$obj->civility_code) != ("Civility".$obj->civility_code) ? $langs->trans("Civility".$obj->civility_code) : $obj->civility_code):'';
Expand Down Expand Up @@ -2465,7 +2465,7 @@ private function _load_ldap_dn($info, $mode = 0)
*
* @return array Tableau info des attributs
*/
private function _load_ldap_info()
public function _load_ldap_info()
{
// phpcs:enable
global $conf,$langs;
Expand Down
2 changes: 1 addition & 1 deletion htdocs/contact/class/contact.class.php
Expand Up @@ -525,7 +525,7 @@ private function _load_ldap_dn($info, $mode = 0)
*
* @return array Tableau info des attributs
*/
private function _load_ldap_info()
public function _load_ldap_info()
{
// phpcs:enable
global $conf, $langs;
Expand Down
1 change: 0 additions & 1 deletion htdocs/user/class/user.class.php
Expand Up @@ -2300,7 +2300,6 @@ public function getNomUrl($withpictoimg = 0, $option = '', $infologin = 0, $noto
if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg=0;

$result=''; $label='';
$link=''; $linkstart=''; $linkend='';

if (! empty($this->photo))
{
Expand Down
3 changes: 1 addition & 2 deletions htdocs/user/class/usergroup.class.php
Expand Up @@ -867,7 +867,6 @@ public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss
if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpicto) $withpicto=0;

$result=''; $label='';
$link=''; $linkstart=''; $linkend='';

$label.= '<div class="centpercent">';
$label.= '<u>' . $langs->trans("Group") . '</u><br>';
Expand Down Expand Up @@ -957,7 +956,7 @@ public function _load_ldap_dn($info, $mode = 0)
public function _load_ldap_info()
{
// phpcs:enable
global $conf,$langs;
global $conf;

$info=array();

Expand Down

0 comments on commit 525598f

Please sign in to comment.