From eab9a252fbb17baaeddfa1ed9138a9ccefa3d649 Mon Sep 17 00:00:00 2001 From: Regis Houssin <regis@dolibarr.fr> Date: Sun, 22 May 2011 08:41:55 +0000 Subject: [PATCH] Fix: rename constante --- htdocs/lib/functions.lib.php | 4 ++-- htdocs/main.inc.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 8f6a1623345..9cfd86fad95 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -3673,7 +3673,7 @@ function get_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepemb $out=''; $divstart=$divend=''; - if (!empty($conf->global->MAIN_DONOT_JQUERY_JNOTIFY) && ! preg_match('/<div class=".*">/i',$out)) + if (! empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! preg_match('/<div class=".*">/i',$out)) { $divstart='<div class="'.$style.'">'; $divend='</div>'; @@ -3703,7 +3703,7 @@ function get_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepemb if ($out) { - if (empty($conf->global->MAIN_DONOT_USE_JQUERY_JNOTIFY) && empty($keepembedded)) + if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && empty($keepembedded)) { $return = '<script type="text/javascript"> $(document).ready(function() { diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index cf11d86081b..72f9e4646c8 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -959,7 +959,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/layout/jquery.layout-latest.min'.$ext.'"></script>'."\n"; } // jQuery jnotify - if (empty($conf->global->MAIN_DONOT_USE_JQUERY_JNOTIFY)) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js"></script>'."\n"; + if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY)) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js"></script>'."\n"; // Flot print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/flot/excanvas.min.js"></script><![endif]-->'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/flot/jquery.flot.min.js"></script>'."\n"; -- GitLab