Merge remote-tracking branch 'origin/3.8' into develop

Dolibarr · Sep 17, 2015 · 27b1f2e · 27b1f2e
2 parents 81b447d + 57521f6
commit 27b1f2e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git 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");

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
@@ -3016,7 +3016,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);
@@ -4677,7 +4677,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);

diff --git 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 '<tr><td>'.$langs->trans("ColorUser").'</td>';
 		print '<td>';
-		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 '</td></tr>';
 	}
 
@@ -2151,7 +2151,7 @@
             {
 				print '<tr><td>'.$langs->trans("ColorUser").'</td>';
 				print '<td>';
-				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 '</td></tr>';
 			}