Merge remote-tracking branch 'origin/3.6' into develop

2014-08-15 02:35:06 +02:00
parent aee35c86d6 6b6b372579
commit 96cb9fe6cb
9 changed files with 9 additions and 3 deletions
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4440,6 +4440,7 @@ function dol_eval($s,$returnvalue=0)
 	global $langs, $user, $conf;
 	global $leftmenu;
 	global $rights;
+	global $object;

 	//print $s."<br>\n";
 	if ($returnvalue) return @eval('return '.$s.';');