From 450a837393993e922bb2b3bcd32f747902cba013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 29 Oct 2018 18:50:15 +0100 Subject: [PATCH 1/2] make play and playdisable equals --- htdocs/core/lib/functions.lib.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index d15d07e4c6e..d3d1e41cb61 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3237,6 +3237,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ elseif ($pictowithoutext == 'playdisabled') { $fakey = 'fa-play'; $facolor = '#ccc'; + } elseif ($pictowithoutext == 'play') { + $fakey = 'fa-play'; + $facolor = '#444'; } else { $fakey = 'fa-'.$pictowithoutext; From 7f7df8d001e4e771509f2dcb33bbecf29afc79ba Mon Sep 17 00:00:00 2001 From: Abbes Bahfir Date: Mon, 29 Oct 2018 22:33:59 +0100 Subject: [PATCH 2/2] Fix: To be possibly intercepted : create, update and delete of the object instead of commonobject must be called --- htdocs/core/actions_addupdatedelete.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php index c7cb1dc6f78..31a6549cc27 100644 --- a/htdocs/core/actions_addupdatedelete.inc.php +++ b/htdocs/core/actions_addupdatedelete.inc.php @@ -72,7 +72,7 @@ if ($action == 'add' && ! empty($permissiontoadd)) if (! $error) { - $result=$object->createCommon($user); + $result=$object->create($user); if ($result > 0) { // Creation OK @@ -127,7 +127,7 @@ if ($action == 'update' && ! empty($permissiontoadd)) if (! $error) { - $result=$object->updateCommon($user); + $result=$object->update($user); if ($result > 0) { $action='view'; @@ -169,7 +169,7 @@ if ($action == "update_extras" && ! empty($permissiontoadd)) // Action to delete if ($action == 'confirm_delete' && ! empty($permissiontodelete)) { - $result=$object->deleteCommon($user); + $result=$object->delete($user); if ($result > 0) { // Delete OK