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

@ -89,8 +89,8 @@ function completeGetPollList(ret_obj, response_tags)
var objPoll = poll_list[x];
htmlListBuffer += '<tr>' +
'<td class="title">'+objPoll.title+'</td>' +
'<td>'+objPoll.poll_count+'</td>' +
'<td>'+objPoll.nick_name+'</td>' +
'<td class="nowr">'+objPoll.poll_count+'</td>' +
'<td class="nowr">'+objPoll.nick_name+'</td>' +
'</tr>' +
'<input type="hidden" name="cart[]" value="'+objPoll.poll_index_srl+'" />';
}