From ffe4ae5915a56ebbf15677d66834feff74270b82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 31 Oct 2016 21:24:23 +0100
Subject: [PATCH] Fix php7 compatibility
---
htdocs/admin/dict.php | 6 ++++--
htdocs/admin/websites.php | 10 ++++++----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 5379a3afd83..211b2a1dc71 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1687,12 +1687,14 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
print '<td>';
if (! empty($conf->accounting->enabled))
{
- $accountancy_account = (! empty($obj->$fieldlist[$field]) ? $obj->$fieldlist[$field] : 0);
+ $fieldname = $fieldlist[$field];
+ $accountancy_account = (! empty($obj->$fieldname) ? $obj->$fieldname : 0);
print $formaccountancy->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
}
else
{
- print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" name="'.$fieldlist[$field].'">';
+ $fieldname = $fieldlist[$field];
+ print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname)?$obj->$fieldname:'').'" name="'.$fieldlist[$field].'">';
}
print '</td>';
}
diff --git a/htdocs/admin/websites.php b/htdocs/admin/websites.php
index ecc6b6a0166..b0c81ec18af 100644
--- a/htdocs/admin/websites.php
+++ b/htdocs/admin/websites.php
@@ -535,7 +535,8 @@ if ($id)
{
$showfield=1;
$align="left";
- $valuetoshow=$obj->$fieldlist[$field];
+ $fieldname=$fieldlist[$field];
+ $valuetoshow=$obj->$fieldname;
// Show value for field
if ($showfield) print '<td align="'.$align.'">'.$valuetoshow.'</td>';
@@ -613,14 +614,15 @@ function fieldListWebsites($fieldlist, $obj='', $tabname='', $context='')
foreach ($fieldlist as $field => $value)
{
+ $fieldname = $fieldlist[$field];
if ($fieldlist[$field] == 'lang')
{
print '<td>';
print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT,'lang');
print '</td>';
}
- elseif ($fieldlist[$field] == 'code' && isset($obj->$fieldlist[$field])) {
- print '<td><input type="text" class="flat" value="'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" size="10" name="'.$fieldlist[$field].'"></td>';
+ elseif ($fieldlist[$field] == 'code' && isset($obj->$fieldname)) {
+ print '<td><input type="text" class="flat" value="'.(! empty($obj->$fieldname)?$obj->$fieldname:'').'" size="10" name="'.$fieldlist[$field].'"></td>';
}
else
{
@@ -631,7 +633,7 @@ function fieldListWebsites($fieldlist, $obj='', $tabname='', $context='')
if ($fieldlist[$field]=='libelle') $size='size="32" ';
if ($fieldlist[$field]=='tracking') $size='size="92" ';
if ($fieldlist[$field]=='sortorder') $size='size="2" ';
- print '<input type="text" '.$size.' class="flat" value="'.(isset($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" name="'.$fieldlist[$field].'">';
+ print '<input type="text" '.$size.' class="flat" value="'.(isset($obj->$fieldname)?$obj->$fieldname:'').'" name="'.$fieldlist[$field].'">';
print '</td>';
}
}
--
GitLab