lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Message style was missing in some situation

Browse Source
This commit is contained in:
Laurent Destailleur 2011-08-23 23:50:15 +00:00
parent 394506bbe2
commit f1c71b1e75
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/lib/functions.lib.php
View File

@ -28,7 +28,7 @@
* \file htdocs/lib/functions.lib.php * \file htdocs/lib/functions.lib.php
* \brief A set of functions for Dolibarr * \brief A set of functions for Dolibarr
* This file contains all frequently used functions. * This file contains all frequently used functions.
* \version $Id: functions.lib.php,v 1.564 2011/08/22 22:04:21 eldy Exp $ * \version $Id: functions.lib.php,v 1.565 2011/08/23 23:50:25 eldy Exp $
*/ */
// For compatibility during upgrade // For compatibility during upgrade
@ -3753,7 +3753,8 @@ function get_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepemb
unset($_SESSION['mesgarray']); unset($_SESSION['mesgarray']);
} }
if (! empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! preg_match('/<div class=".*">/i',$out)) // If inline message with no format, we add it.
if ((! empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) || $keepembedded) && ! preg_match('/<div class=".*">/i',$out))
{ {
$divstart='<div class="'.$style.'">'; $divstart='<div class="'.$style.'">';
$divend='</div>'; $divend='</div>';
@ -3839,7 +3840,7 @@ function get_htmloutput_errors($mesgstring='', $mesgarray='', $keepembedded=0)
* @param mesgstring Message * @param mesgstring Message
* @param mesgarray Messages array * @param mesgarray Messages array
* @param style Which style to use ('ok', 'error') * @param style Which style to use ('ok', 'error')
* @param keepembedded Set to 1 in error message must be kept embedded into its html place (this disable jnotify) * @param keepembedded Set to 1 if message must be kept embedded into its html place (this disable jnotify)
* @see dol_print_error * @see dol_print_error
* @see dol_htmloutput_errors * @see dol_htmloutput_errors
*/ */

12
htdocs/societe/societe.php
View File

@ -21,7 +21,7 @@
* \file htdocs/societe/societe.php * \file htdocs/societe/societe.php
* \ingroup societe * \ingroup societe
* \brief Page to show a third party * \brief Page to show a third party
* \version $Id: societe.php,v 1.12 2011/07/31 23:22:56 eldy Exp $ * \version $Id: societe.php,v 1.13 2011/08/23 23:50:15 eldy Exp $
*/ */
require_once("../main.inc.php"); require_once("../main.inc.php");
@ -158,8 +158,6 @@ if ($socname)
$search_nom=$socname; $search_nom=$socname;
} }
// Affiche la confirmation de suppression d'un tiers
if ($_GET['delsoc']) print '<div class="warning">'.$langs->trans("CompanyDeleted",$_GET['delsoc']).'</div><br>';
/* /*
* Mode Liste * Mode Liste
@ -281,6 +279,12 @@ if ($resql)
print_barre_liste($title, $page, $_SERVER["PHP_SELF"],$params,$sortfield,$sortorder,'',$num,$nbtotalofrecords); print_barre_liste($title, $page, $_SERVER["PHP_SELF"],$params,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
// Show delete result message
if (GETPOST('delsoc'))
{
dol_htmloutput_mesg($langs->trans("CompanyDeleted",GETPOST('delsoc')),'','ok');
}
$langs->load("other"); $langs->load("other");
$textprofid=array(); $textprofid=array();
foreach(array(1,2,3,4) as $key) foreach(array(1,2,3,4) as $key)
@ -429,5 +433,5 @@ else
$db->close(); $db->close();
llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.12 $'); llxFooter('$Date: 2011/08/23 23:50:15 $ - $Revision: 1.13 $');
?> ?>