From 099e3f03760203bd4180a12bfb8b7d26811108c5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 17 Sep 2015 00:47:56 +0200 Subject: [PATCH 1/3] FIX Removed warnings --- htdocs/user/card.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index f545e32571279..4cfb2a965627b 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -278,7 +278,7 @@ { $editgroup = new UserGroup($db); $editgroup->fetch($group); - $editgroup->oldcopy=dol_clone($editgroup); + $editgroup->oldcopy=clone($editgroup); $object->fetch($id); if ($action == 'addgroup') $object->SetInGroup($group,($conf->multicompany->transverse_mode?GETPOST("entity"):$editgroup->entity)); @@ -340,7 +340,7 @@ { $db->begin(); - $object->oldcopy=dol_clone($object); + $object->oldcopy=clone($object); $object->lastname = GETPOST("lastname",'alpha'); $object->firstname = GETPOST("firstname",'alpha'); @@ -508,7 +508,7 @@ { $object->fetch($id); - $object->oldcopy=dol_clone($object); + $object->oldcopy=clone($object); $ret=$object->setPassword($user,$_POST["password"]); if ($ret < 0) @@ -1046,7 +1046,7 @@ { print ''.$langs->trans("ColorUser").''; print ''; - print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', 'usercolorconfig', 1, '', 'hideifnotset'); + print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset'); print ''; } @@ -2151,7 +2151,7 @@ { print ''.$langs->trans("ColorUser").''; print ''; - print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', 'usercolorconfig', 1, '', 'hideifnotset'); + print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset'); print ''; } From 8bb832d06b4441438445a084b604fe418b9a51c9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 17 Sep 2015 00:48:10 +0200 Subject: [PATCH 2/3] Fix Natural english --- build/exe/doliwamp/UsedPort.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/exe/doliwamp/UsedPort.cpp b/build/exe/doliwamp/UsedPort.cpp index 15d2978b3bbee..e2724b831a1c2 100644 --- a/build/exe/doliwamp/UsedPort.cpp +++ b/build/exe/doliwamp/UsedPort.cpp @@ -277,7 +277,7 @@ help=!(Port > 0); Usage: if (help) { printf("----- %s V%s (c)Laurent Destailleur -----\n",PROG,VERSION); - printf("%s is a software that allows you to know if a TCP/IP port is used\n",PROG); + printf("%s is software that allows you to know if a TCP/IP port is used\n",PROG); printf("%s sources can be compiled for WIN32 (VC++, GCC CYGWIN, MINGW) or for\n"); printf("Unix/Linux (GCC)\n",PROG); printf("\n"); From 57521f628c35109cd6f88fd4693d7bb1375bc27a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 17 Sep 2015 19:35:03 +0200 Subject: [PATCH 3/3] Fix bad path --- htdocs/core/class/html.form.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index f1492f9a5b457..c732b8cd6735c 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3015,7 +3015,7 @@ function select_all_categories($type, $selected='', $htmlname="parent", $maxleng global $langs; $langs->load("categories"); - include_once DOL_DOCUMENT_ROOT.'/categories/class.categorie.class.php'; + include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $cat = new Categorie($this->db); $cate_arbo = $cat->get_full_arbo($type,$excludeafterid); @@ -4675,7 +4675,7 @@ function showCategories($id, $type, $rendermode=0) { global $db; - include_once DOL_DOCUMENT_ROOT.'/categories/class.categorie.class.php'; + include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $cat = new Categorie($db); $categories = $cat->containing($id, $type);