= $Now || $_POST['basetime']>=$page['time'] || $page['text'] == $new['text']) return; $EnablePost = 0; $old = array(); RestorePage($pagename,$page,$old,"diff:{$_POST['basetime']}"); $text = Merge($new['text'],$old['text'],$page['text']); if ($text > '') { $new['text'] = $text; $ec = '$[EditConflict]'; } else $ec = '$[EditWarning]'; XLSDV('en', array( 'EditConflict' => "The page you are editing has been modified since you started editing it. The modifications have been merged into the text below, you may want to verify the results of the merge before pressing save. Conflicts the system couldn't resolve are bracketed by <<<<<<< and >>>>>>>.", 'EditWarning' => "The page you are editing has been modified since you started editing it. If you continue, your changes will overwrite any changes that others have made.")); $MessagesFmt[] = "

$ec ($[View changes])

\n"; }