test commit
test commit
Author: leonshao
Description: 首页界面增加导航"投票", 并设置权限.
Author: leonshao
Description: 网站安装完成, 删除install/index.php
Author: leonshao
Description:
  投票选项表增加optionremark字段, 在投票过期后展示选项备注. 主要改动如下:
  1. install/data/modify.sql
     增加字段optionremark

  2. data/template/1_1_forum_post_poll.tpl.php
     增加选项备注的输入框数组optionremark[],与选项数组polloption[]一一对应

  3. source/class/extend/extend_thread_poll.php
     从请求参数中获取选项备注数组并与选项一起插入数据库

  4. source/include/thread/thread_poll.php
     从数据库获取选项备注

  5. template/default/forum/viewthread_poll.htm
     增加逻辑判断, 在投票过期并且选项备注非空时才展示
Author: leonshao
Description: 补齐提交
Merge branch 'leonshao-develop' into develop

Conflicts:
	data/log/201407_cplog.php
	data/template/1_1_common_header_forum_index.tpl.php
	data/template/1_1_member_login.tpl.php
Author: leonshao
Description: 修复merge分支时的文件冲突
Author: leonshao
Description: 修复合并分支时的文件冲突
view change
delete log
Merge branch 'master' into develop

Conflicts:
	data/template/1_1_common_footer.tpl.php
	data/template/1_1_common_header_forum_forumdisplay.tpl.php
	data/template/1_1_common_header_forum_index.tpl.php
	data/template/1_1_common_header_forum_viewthread.tpl.php
	data/template/1_1_common_header_portal_index.tpl.php
	data/template/1_1_forum_viewthread_poll.tpl.php
	data/template/1_diy_forum_forumdisplay.tpl.php
	data/template/1_diy_forum_viewthread.tpl.php
fix