From 07f7717b514db604e73434e1734c35147e60fb37 Mon Sep 17 00:00:00 2001 From: braito4 Date: Mon, 28 Dec 2015 11:28:18 +0100 Subject: [PATCH 1/2] Fix Warning #4229 PHP7 --- htdocs/resource/class/resource.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php index e6c01eb09f4..b7e0caa7bfc 100644 --- a/htdocs/resource/class/resource.class.php +++ b/htdocs/resource/class/resource.class.php @@ -627,7 +627,7 @@ class Resource extends CommonObject * @param int $fieldid Name of field to use for the select MAX and MIN * @return int <0 if KO, >0 if OK */ - function load_previous_next_ref($filter,$fieldid) + function load_previous_next_ref($filter, $fieldid, $nodbprefix ='') { global $conf, $user; From 47ee8993d3daa909e98874abad1abd17778889e4 Mon Sep 17 00:00:00 2001 From: braito4 Date: Mon, 28 Dec 2015 11:47:12 +0100 Subject: [PATCH 2/2] fix travis --- htdocs/resource/class/resource.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php index b7e0caa7bfc..c323ad17e69 100644 --- a/htdocs/resource/class/resource.class.php +++ b/htdocs/resource/class/resource.class.php @@ -624,10 +624,11 @@ class Resource extends CommonObject * Load properties id_previous and id_next * * @param string $filter Optional filter - * @param int $fieldid Name of field to use for the select MAX and MIN + * @param int $fieldid Name of field to use for the select MAX and MIN + * @param int $nodbprefix Do not include DB prefix to forge table name * @return int <0 if KO, >0 if OK */ - function load_previous_next_ref($filter, $fieldid, $nodbprefix ='') + function load_previous_next_ref($filter, $fieldid, $nodbprefix =0) { global $conf, $user;