diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index 4ab41c7991e..3fe94c1d8c5 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -147,7 +147,7 @@ if ($action == 'add') } if (! $error && ! $_POST['url']) { - setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Url")), 'errors'); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("URL")), 'errors'); $action = 'create'; $error++; } diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 99c73dc4837..b73f8a0743b 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -485,13 +485,14 @@ if ($object->fetch($id) >= 0) { include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; $m=new Adherent($db); - $m->id=$obj->source_id; + $m->fetch($obj->source_id); print $m->getNomUrl(2); } else if ($obj->source_type == 'user') { include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; $m=new User($db); + $m->fetch($obj->source_id); $m->id=$obj->source_id; print $m->getNomUrl(2); } @@ -499,7 +500,7 @@ if ($object->fetch($id) >= 0) { include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $m=new Societe($db); - $m->id=$obj->source_id; + $m->fetch($obj->source_id); print $m->getNomUrl(2); } else diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 9c77729ac5a..0cc43080c6c 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -814,7 +814,14 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."
\n"; // Define $sqlstring - $posnumstart=strrpos($maskwithnocode,$maskcounter); // Pos of counter in final string (from 0 to ...) + if (function_exists('mb_strrpos')) + { + $posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8'); + } + else + { + $posnumstart=strrpos($maskwithnocode,$maskcounter); + } // Pos of counter in final string (from 0 to ...) if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence'; $sqlstring='SUBSTRING('.$field.', '.($posnumstart+1).', '.dol_strlen($maskcounter).')';