From 88bb64d5251f1ed8f6cc4009c33957340c9431c8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 21 May 2011 14:37:30 +0000
Subject: [PATCH] New: Usage of jquery notify is on by default. We can still
 deisable it by a hidden option.

---
 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 be6ab9131d1..8f6a1623345 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_USE_JQUERY_JNOTIFY) && ! preg_match('/<div class=".*">/i',$out))
+    if (!empty($conf->global->MAIN_DONOT_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_USE_JQUERY_JNOTIFY) && empty($keepembedded))
+        if (empty($conf->global->MAIN_DONOT_USE_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 59feae3dd42..cf11d86081b 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_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_DONOT_USE_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";