From b7c56f5680c74a33809b9999a1ad02d1742c447b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Jan 2023 11:54:05 +0100 Subject: [PATCH] Fix warning --- htdocs/bookmarks/card.php | 8 +++++--- htdocs/bookmarks/list.php | 10 ++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php index 5b22b8918d9..245161ed253 100644 --- a/htdocs/bookmarks/card.php +++ b/htdocs/bookmarks/card.php @@ -188,7 +188,8 @@ if ($action == 'create') { // Visibility / Owner print ''.$langs->trans("Visibility").''; - print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id, 'userid', 0, '', 0, ($user->admin ? '' : array($user->id)), '', 0, 0, 0, '', ($user->admin) ? 1 : 0, '', 'maxwidth300 widthcentpercentminusx'); + print img_picto('', 'user', 'class="pictofixedwidth"'); + print $form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id, 'userid', 0, '', 0, ($user->admin ? '' : array($user->id)), '', 0, 0, 0, '', ($user->admin) ? 1 : 0, '', 'maxwidth300 widthcentpercentminusx'); print ''; // Position @@ -282,12 +283,13 @@ if ($id > 0 && !preg_match('/^add/i', $action)) { // Visibility / owner print ''.$langs->trans("Visibility").''; if ($action == 'edit' && $user->admin) { - print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300 widthcentpercentminusx'); + print img_picto('', 'user', 'class="pictofixedwidth"'); + print $form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300 widthcentpercentminusx'); } else { if ($object->fk_user > 0) { $fuser = new User($db); $fuser->fetch($object->fk_user); - print $fuser->getNomUrl(1); + print $fuser->getNomUrl(-1); } else { print ''.$langs->trans("Everybody").''; } diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index 2500d40e25d..2adef615a70 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -212,8 +212,6 @@ print_liste_field_titre("Position", $_SERVER["PHP_SELF"], "b.position", "", $par print_liste_field_titre(''); print "\n"; -$cacheOfUsers = array(); - $i = 0; while ($i < min($num, $limit)) { $obj = $db->fetch_object($resql); @@ -268,13 +266,13 @@ while ($i < min($num, $limit)) { // Author print ''; if ($obj->fk_user) { - if (empty($cacheOfUsers[$obj->fk_user])) { + if (empty($conf->cache['users'][$obj->fk_user])) { $tmpuser = new User($db); $tmpuser->fetch($obj->fk_user); - $cacheOfUsers[$obj->fk_user] = $tmpuser; + $conf->cache['users'][$obj->fk_user] = $tmpuser; } - $tmpuser = $cacheOfUsers[$obj->fk_user]; - print $tmpuser->getNomUrl(1); + $tmpuser = $conf->cache['users'][$obj->fk_user]; + print $tmpuser->getNomUrl(-1); } else { print ''.$langs->trans("Everybody").''; if (!$user->admin) {