* [bug#56746,done,0.3h] fix bug resolution field error.
This commit is contained in:
@@ -907,10 +907,10 @@ class commonModel extends model
|
||||
|
||||
if($value != stripslashes((string)$old->$key))
|
||||
{
|
||||
$diff = '';
|
||||
if(substr_count((string)$value, "\n") > 1 or
|
||||
substr_count((string)$old->$key, "\n") > 1 or
|
||||
strpos(',name,title,desc,spec,steps,content,digest,verify,report,definition,analysis,summary,prevention,resolution,outline,schedule,minutes,sql,interface,ui,langs,performance,privileges,search,actions,deploy,bi,safe,other,', ',' . strtolower($key) . ',') !== false)
|
||||
$diff = '';
|
||||
$showDiff = (substr_count((string)$value, "\n") > 1 || substr_count((string)$old->$key, "\n") > 1 || strpos(',name,title,desc,spec,steps,content,digest,verify,report,definition,analysis,summary,prevention,resolution,outline,schedule,minutes,sql,interface,ui,langs,performance,privileges,search,actions,deploy,bi,safe,other,', ',' . strtolower($key) . ',') !== false);
|
||||
$hiddenDiff = array('bug' => 'resolution');
|
||||
if($showDiff && (!isset($hiddenDiff[$moduleName]) || (isset($hiddenDiff[$moduleName]) && strpos(",$hiddenDiff[$moduleName],", ",$key,") === false)))
|
||||
{
|
||||
$diff = commonModel::diff((string)$old->$key, (string)$value);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user