merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -183,12 +183,17 @@
}
// if additional information which can access contents is set
if($add_content_info) {
$memberSrl = $this->get('member_srl');
if($memberSrl < 0)
{
$memberSrl = 0;
}
$content = sprintf(
'<!--BeforeComment(%d,%d)--><div class="comment_%d_%d xe_content">%s</div><!--AfterComment(%d,%d)-->',
$this->comment_srl, $this->get('member_srl'),
$this->comment_srl, $this->get('member_srl'),
$this->comment_srl, $memberSrl,
$this->comment_srl, $memberSrl,
$content,
$this->comment_srl, $this->get('member_srl')
$this->comment_srl, $memberSrl
);
// xe_content class name should be specified although content access is not necessary.
} else {