diff --git a/htdocs/includes/boxes/box_external_rss.php b/htdocs/includes/boxes/box_external_rss.php index c07cc51bd22..b5bd6671314 100644 --- a/htdocs/includes/boxes/box_external_rss.php +++ b/htdocs/includes/boxes/box_external_rss.php @@ -69,11 +69,13 @@ class box_external_rss extends ModeleBoxes { if ($rss->ERROR) { // Affiche warning car il y a eu une erreur $title.=" ".img_error($langs->trans("FailedToRefreshDataInfoNotUpToDate",(isset($rss->date)?dolibarr_print_date($rss->date,"%d %b %Y %H:%M"):'unknown date'))); - $this->info_box_head = array('text' => $title); + $this->info_box_head = array('text' => $title,'limit' => 0); } - - $this->info_box_head = array('text' => $title); - + else + { + $this->info_box_head = array('text' => $title); + } + for($i = 0; $i < $max ; $i++){ $item = $rss->items[$i]; $href = $item['link']; diff --git a/htdocs/includes/boxes/modules_boxes.php b/htdocs/includes/boxes/modules_boxes.php index 17feea8e323..6cc7c1444b9 100644 --- a/htdocs/includes/boxes/modules_boxes.php +++ b/htdocs/includes/boxes/modules_boxes.php @@ -70,7 +70,8 @@ class ModeleBoxes // Affiche titre de la boite print ' 0) { print ' colspan="'.$nbcol.'"'; } - print '>'.dolibarr_trunc($head['text'],$this->MAXLENGTHBOX); + print '>'; + print dolibarr_trunc($head['text'],isset($head['limit'])?$head['limit']:$this->MAXLENGTHBOX); if ($head['sublink']) { print ' '.img_picto($head['subtext'],$head['subpicto']).''; diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index d52cde3a168..a1986621b56 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -516,11 +516,12 @@ function dolibarr_print_phone($phone,$country="FR") /** \brief Tronque une chaine à une taille donnée en ajoutant les points de suspension si cela dépasse \param string Chaine à tronquer - \param size Longueur max de la chaine + \param size Longueur max de la chaine. Si 0, pas de limite. \return string Chaine tronquée */ function dolibarr_trunc($string,$size=40) { + if ($size==0) return $string; if (strlen($string) > $size) return substr($string,0,$size).'...'; else