添加文件
添加文件
修改XML处理类
修正语法错误
修改风格管理页显示样式
修改风格管理页显示样式
修正XML处理类编码错误
添加文件
添加文件
系统升级
添加文件
添加文件
Merge branch 'makeitcount' of github.com:Magillusionalgame/dps_DiscuzX into makeitcount

Conflicts:
	api/addons/channel.htm
	api/manyou/Service/Client/Message.php
	api/manyou/Service/Client/Notification.php
	api/manyou/Service/Client/OAuth.php
	api/manyou/Service/Connect.php
	api/manyou/Service/DiscuzTips.php
	api/manyou/Service/Disk.php
	api/manyou/Service/SearchHelper.php
	api/manyou/Service/Security.php
	api/manyou/Service/Server/Security.php
	api/manyou/Service/Util.php
	api/manyou/channel.htm
	api/manyou/getmaillist.htm
	api/mobile/index.php
	api/remote/mod/mod_index.php
	api/trade/api_tenpay.php
	develop/include/export.php
	develop/include/hooklist.php
	develop/include/list.php
	develop/include/regplugin.php
	develop/include/script.php
	develop/include/setting.php
	develop/plugin.lang.php
	develop/plugin.php
	develop/template/ajax.htm
	develop/template/common.js
	develop/template/common/developer.css
	develop/template/common/footer.htm
	develop/template/common/header.htm
	develop/template/common/showmessage.htm
	develop/template/language.htm
	develop/template/list.htm
	develop/template/nav.htm
	develop/template/plugin.htm
	develop/template/script.htm
	favicon.ico
	install/data/common_district_1.sql
	install/data/common_district_2.sql
	install/data/common_district_3.sql
	install/data/group_index.xml
	install/data/install.sql
	install/data/install_data.sql
	install/include/install_extvar.php
	install/include/install_function.php
	install/include/install_lang.php
	install/include/install_var.php
	install/index.php
	source/admincp/admincp_admingroup.php
	source/admincp/admincp_adv.php
	source/admincp/admincp_announce.php
	source/admincp/admincp_article.php
	source/admincp/admincp_blockstyle.php
	source/admincp/admincp_blog.php
	source/admincp/admincp_checktools.php
	source/admincp/admincp_cloudaddons.php
	source/admincp/admincp_collection.php
	source/admincp/admincp_counter.php
	source/admincp/admincp_credits.php
	source/admincp/admincp_db.php
	source/admincp/admincp_domain.php
	source/admincp/admincp_ec.php
	source/admincp/admincp_feed.php
	source/admincp/admincp_forums.php
	source/admincp/admincp_group.php
	source/admincp/admincp_login.php
	source/admincp/admincp_magics.php
	source/admincp/admincp_main.php
	source/admincp/admincp_medals.php
	source/admincp/admincp_members.php
	source/admincp/admincp_membersplit.php
	source/admincp/admincp_menu.php
	source/admincp/admincp_misc.php
	source/admincp/admincp_moderate.php
	source/admincp/admincp_nav.php
	source/admincp/admincp_plugins.php
	source/admincp/admincp_portalcategory.php
	source/admincp/admincp_prune.php
	source/admincp/admincp_setting.php
	source/admincp/admincp_styles.php
	source/admincp/admincp_tasks.php
	source/admincp/admincp_threadtypes.php
	source/admincp/admincp_topic.php
	source/admincp/admincp_usergroups.php
	source/admincp/cloud/cloud_qqgroup.php
	source/admincp/cloud/cloud_security.php
	source/admincp/discuzdb.md5
	source/admincp/discuzfiles.md5
	source/admincp/discuzhook.dat
	source/admincp/moderate/moderate_comment.php
	source/admincp/moderate/moderate_reply.php
	source/admincp/moderate/moderate_thread.php
	source/archiver/common/footer.php
	source/archiver/common/header.php
	source/archiver/forum/viewthread.php
	source/class/block/portal/block_article.php
	source/class/block/portal/block_topic.php
	source/class/class_core.php
	source/class/class_credit.php
	source/class/class_image.php
	source/class/class_member.php
	source/class/class_seccode.php
	source/class/class_task.php
	source/class/class_template.php
	source/class/db/db_driver_mysql_slave.php
	source/class/discuz/discuz_admincp.php
	source/class/discuz/discuz_application.php
	source/class/discuz/discuz_base.php
	source/class/discuz/discuz_censor.php
	source/class/discuz/discuz_cron.php
	source/class/discuz/discuz_database.php
	source/class/discuz/discuz_model.php
	source/class/discuz/discuz_table.php
	source/class/discuz/discuz_table_archive.php
	source/class/forum/forum_upload.php
	source/class/helper/helper_dbtool.php
	source/class/helper/helper_form.php
	source/class/helper/helper_mobile.php
	source/class/helper/helper_notification.php
	source/class/helper/helper_page.php
	source/class/helper/helper_seo.php
	source/class/helper/helper_sysmessage.php
	source/class/helper/helper_util.php
	source/class/memory/memory_driver_eaccelerator.php
	source/class/table/table_common_adminnote.php
	source/class/table/table_common_block_item_data.php
	source/class/table/table_common_card_log.php
	source/class/table/table_common_credit_log.php
	source/class/table/table_common_cron.php
	source/class/table/table_common_failedlogin.php
	source/class/table/table_common_magiclog.php
	source/class/table/table_common_member.php
	source/class/table/table_common_member_count.php
	source/class/table/table_common_member_crime.php
	source/class/table/table_common_member_verify_info.php
	source/class/table/table_common_nav.php
	source/class/table/table_common_plugin.php
	source/class/table/table_common_setting.php
	source/class/table/table_common_usergroup.php
	source/class/table/table_custom_usefullinks.php
	source/class/table/table_forum_collection.php
	source/class/table/table_forum_debatepost.php
	source/class/table/table_forum_faq.php
	source/class/table/table_forum_forum.php
	source/class/table/table_forum_groupuser.php
	source/class/table/table_forum_post.php
	source/class/table/table_forum_postcomment.php
	source/class/table/table_forum_ratelog.php
	source/class/table/table_forum_statlog.php
	source/class/table/table_forum_thread.php
	source/class/table/table_forum_threadimage.php
	source/class/table/table_home_blacklist.php
	source/class/table/table_home_blog.php
	source/class/table/table_home_comment.php
	source/class/table/table_home_notification.php
	source/class/table/table_home_visitor.php
	source/class/table/table_portal_article_title.php
	source/class/table/table_portal_topic.php
	source/discuz_version.php
	source/function/cache/cache_advs.php
	source/function/cache/cache_forums.php
	source/function/cache/cache_plugin.php
	source/function/cache/cache_portalcategory.php
	source/function/cache/cache_setting.php
	source/function/cache/cache_styles.php
	source/function/cache/cache_usergroups.php
	source/function/function_admincp.php
	source/function/function_blog.php
	source/function/function_cache.php
	source/function/function_cloudaddons.php
	source/function/function_collection.php
	source/function/function_comment.php
	source/function/function_core.php
	source/function/function_credit.php
	source/function/function_delete.php
	source/function/function_discuzcode.php
	source/function/function_editor.php
	source/function/function_exif.php
	source/function/function_filesock.php
	source/function/function_forum.php
	source/function/function_forumlist.php
	source/function/function_group.php
	source/function/function_home.php
	source/function/function_member.php
	source/function/function_message.php
	source/function/function_misc.php
	source/function/function_plugin.php
	source/function/function_portal.php
	source/function/function_post.php
	source/function/function_profile.php
	source/function/function_seccode.php
	source/function/function_share.php
	source/function/function_space.php
	source/function/function_threadsort.php
	source/include/collection/collection_comment.php
	source/include/collection/collection_index.php
	source/include/collection/collection_view.php
	source/include/cron/cron_cleanup_daily.php
	source/include/cron/cron_todaypost_daily.php
	source/include/misc/misc_category.php
	source/include/misc/misc_emailcheck.php
	source/include/modcp/modcp_member.php
	source/include/modcp/modcp_moderate.php
	source/include/portalcp/portalcp_article.php
	source/include/portalcp/portalcp_block.php
	source/include/portalcp/portalcp_portalblock.php
	source/include/post/post_editpost.php
	source/include/post/post_newreply.php
	source/include/post/post_newthread.php
	source/include/post/post_newtrade.php
	source/include/space/space_activity.php
	source/include/space/space_blog.php
	source/include/space/space_favorite.php
	source/include/space/space_index.php
	source/include/space/space_notice.php
	source/include/space/space_pm.php
	source/include/space/space_thread.php
	source/include/spacecp/spacecp_album.php
	source/include/spacecp/spacecp_click.php
	source/include/spacecp/spacecp_credit.php
	source/include/spacecp/spacecp_credit_base.php
	source/include/spacecp/spacecp_credit_log.php
	source/include/spacecp/spacecp_doing.php
	source/include/spacecp/spacecp_favorite.php
	source/include/spacecp/spacecp_follow.php
	source/include/spacecp/spacecp_friend.php
	source/include/spacecp/spacecp_profile.php
	source/include/spacecp/spacecp_share.php
	source/include/spacecp/spacecp_usergroup.php
	source/include/thread/thread_poll.php
	source/include/thread/thread_printable.php
	source/include/topicadmin/topicadmin_banpost.php
	source/include/topicadmin/topicadmin_copy.php
	source/include/topicadmin/topicadmin_delcomment.php
	source/include/topicadmin/topicadmin_delpost.php
	source/include/topicadmin/topicadmin_merge.php
	source/include/topicadmin/topicadmin_moderate.php
	source/include/topicadmin/topicadmin_refund.php
	source/include/topicadmin/topicadmin_removereward.php
	source/include/topicadmin/topicadmin_split.php
	source/include/topicadmin/topicadmin_stamp.php
	source/include/topicadmin/topicadmin_stamplist.php
	source/include/topicadmin/topicadmin_stickreply.php
	source/include/topicadmin/topicadmin_warn.php
	source/language/forum/lang_misc.php
	source/language/forum/lang_modaction.php
	source/language/forum/lang_swfupload.php
	source/language/forum/lang_template.php
	source/language/forum/lang_thread.php
	source/language/group/lang_template.php
	source/language/home/lang_template.php
	source/language/lang_admincp.php
	source/language/lang_admincp_cloud.php
	source/language/lang_admincp_menu.php
	source/language/lang_admincp_msg.php
	source/language/lang_message.php
	source/language/lang_notification.php
	source/language/lang_seccode.php
	source/language/lang_space.php
	source/language/lang_spacecp.php
	source/language/lang_template.php
	source/language/member/lang_template.php
	source/language/mobile/lang_template.php
	source/language/portal/lang_template.php
	source/language/ranklist/lang_navtitle.php
	source/module/forum/forum_ajax.php
	source/module/forum/forum_attachment.php
	source/module/forum/forum_forumdisplay.php
	source/module/forum/forum_group.php
	source/module/forum/forum_guide.php
	source/module/forum/forum_image.php
	source/module/forum/forum_index.php
	source/module/forum/forum_misc.php
	source/module/forum/forum_post.php
	source/module/forum/forum_rss.php
	source/module/forum/forum_topicadmin.php
	source/module/forum/forum_viewthread.php
	source/module/home/home_follow.php
	source/module/home/home_magic.php
	source/module/home/home_spacecp.php
	source/module/member/member_connect_logging.php
	source/module/member/member_connect_register.php
	source/module/misc/misc_buyinvitecode.php
	source/module/misc/misc_invite.php
	source/module/misc/misc_patch.php
	source/module/misc/misc_seccode.php
	source/module/misc/misc_stat.php
	source/module/misc/misc_swfupload.php
	source/module/portal/portal_comment.php
	source/module/portal/portal_index.php
	source/module/portal/portal_list.php
	source/module/portal/portal_topic.php
	source/module/portal/portal_view.php
	source/module/search/search_collection.php
	source/module/search/search_group.php
	source/module/search/search_my.php
	source/plugin/mobile/api/1/checkpost.php
	source/plugin/mobile/api/1/connect.php
	source/plugin/mobile/api/1/favthread.php
	source/plugin/mobile/api/1/forumdisplay.php
	source/plugin/mobile/api/1/forumnav.php
	source/plugin/mobile/api/1/hotforum.php
	source/plugin/mobile/api/1/hotthread.php
	source/plugin/mobile/api/1/login.php
	source/plugin/mobile/api/1/mypm.php
	source/plugin/mobile/api/1/mythread.php
	source/plugin/mobile/api/1/newthread.php
	source/plugin/mobile/api/1/profile.php
	source/plugin/mobile/api/1/publicpm.php
	source/plugin/mobile/api/1/register.php
	source/plugin/mobile/api/1/seccode.php
	source/plugin/mobile/api/1/secure.php
	source/plugin/mobile/api/1/sendreply.php
	source/plugin/mobile/api/1/sub_checkpost.php
	source/plugin/mobile/api/1/toplist.php
	source/plugin/mobile/api/1/viewthread.php
	source/plugin/mobile/api/2/forumimage.php
	source/plugin/mobile/api/2/modcp.php
	source/plugin/mobile/api/2/mynotelist.php
	source/plugin/mobile/api/2/pollvote.php
	source/plugin/mobile/api/2/topicadmin.php
	source/plugin/mobile/api/2/uploadavatar.php
	source/plugin/mobile/check.php
	source/plugin/mobile/discuz_plugin_mobile.xml
	source/plugin/mobile/extends/mobile_extends_check.php
	source/plugin/mobile/extends/mobile_extends_list.php
	source/plugin/mobile/extends/module/dz_digest.php
	source/plugin/mobile/extends/module/dz_newreply.php
	source/plugin/mobile/extends/module/dz_newthread.php
	source/plugin/mobile/install.php
	source/plugin/mobile/mobile.class.php
	source/plugin/mobile/mobile.php
	source/plugin/mobile/mobile_extends.php
	source/plugin/mobile/table/table_common_devicetoken.php
	source/plugin/mobile/table/table_mobile_setting.php
	source/plugin/mobile/upgrade.php
	source/plugin/soso_smilies/discuz_plugin_soso_smilies.xml
	static/image/admincp/admincp.css
	static/image/common/collapsed_no.gif
	static/image/common/collapsed_yes.gif
	static/image/common/forum.gif
	static/image/common/forum_new.gif
	static/image/common/qmenu.png
	static/image/common/scrolltop.png
	static/image/common/search.png
	static/image/editor/editor.gif
	static/image/editor/editor_base.js
	static/js/admincp.js
	static/js/at.js
	static/js/bbcode.js
	static/js/common.js
	static/js/common_extra.js
	static/js/editor.js
	static/js/forum.js
	static/js/forum_post.js
	static/js/forum_viewthread.js
	static/js/handlers.js
	static/js/home.js
	static/js/home_drag.js
	static/js/home_uploadpic.js
	static/js/portal.js
	static/js/portal_upload.js
	static/js/register.js
	static/js/swfupload.js
	static/topic/t3/images/title.png
	static/topic/t3/preview.jpg
	static/topic/t3/style.css
	template/default
	uc_client
Merge branch 'makeitcount' of github.com:Magillusionalgame/dps_DiscuzX into makeitcount

Conflicts:
	api/addons/channel.htm
	api/manyou/Service/Client/Message.php
	api/manyou/Service/Client/Notification.php
	api/manyou/Service/Client/OAuth.php
	api/manyou/Service/Connect.php
	api/manyou/Service/DiscuzTips.php
	api/manyou/Service/Disk.php
	api/manyou/Service/SearchHelper.php
	api/manyou/Service/Security.php
	api/manyou/Service/Server/Security.php
	api/manyou/Service/Util.php
	api/manyou/channel.htm
	api/manyou/getmaillist.htm
	api/mobile/index.php
	api/remote/mod/mod_index.php
	api/trade/api_tenpay.php
	develop/include/export.php
	develop/include/hooklist.php
	develop/include/list.php
	develop/include/regplugin.php
	develop/include/script.php
	develop/include/setting.php
	develop/plugin.lang.php
	develop/plugin.php
	develop/template/ajax.htm
	develop/template/common.js
	develop/template/common/developer.css
	develop/template/common/footer.htm
	develop/template/common/header.htm
	develop/template/common/showmessage.htm
	develop/template/language.htm
	develop/template/list.htm
	develop/template/nav.htm
	develop/template/plugin.htm
	develop/template/script.htm
	favicon.ico
	install/data/common_district_1.sql
	install/data/common_district_2.sql
	install/data/common_district_3.sql
	install/data/group_index.xml
	install/data/install.sql
	install/data/install_data.sql
	install/include/install_extvar.php
	install/include/install_function.php
	install/include/install_lang.php
	install/include/install_var.php
	install/index.php
	source/admincp/admincp_admingroup.php
	source/admincp/admincp_adv.php
	source/admincp/admincp_announce.php
	source/admincp/admincp_article.php
	source/admincp/admincp_blockstyle.php
	source/admincp/admincp_blog.php
	source/admincp/admincp_checktools.php
	source/admincp/admincp_cloudaddons.php
	source/admincp/admincp_collection.php
	source/admincp/admincp_counter.php
	source/admincp/admincp_credits.php
	source/admincp/admincp_db.php
	source/admincp/admincp_domain.php
	source/admincp/admincp_ec.php
	source/admincp/admincp_feed.php
	source/admincp/admincp_forums.php
	source/admincp/admincp_group.php
	source/admincp/admincp_login.php
	source/admincp/admincp_magics.php
	source/admincp/admincp_main.php
	source/admincp/admincp_medals.php
	source/admincp/admincp_members.php
	source/admincp/admincp_membersplit.php
	source/admincp/admincp_menu.php
	source/admincp/admincp_misc.php
	source/admincp/admincp_moderate.php
	source/admincp/admincp_nav.php
	source/admincp/admincp_plugins.php
	source/admincp/admincp_portalcategory.php
	source/admincp/admincp_prune.php
	source/admincp/admincp_setting.php
	source/admincp/admincp_styles.php
	source/admincp/admincp_tasks.php
	source/admincp/admincp_threadtypes.php
	source/admincp/admincp_topic.php
	source/admincp/admincp_usergroups.php
	source/admincp/cloud/cloud_qqgroup.php
	source/admincp/cloud/cloud_security.php
	source/admincp/discuzdb.md5
	source/admincp/discuzfiles.md5
	source/admincp/discuzhook.dat
	source/admincp/moderate/moderate_comment.php
	source/admincp/moderate/moderate_reply.php
	source/admincp/moderate/moderate_thread.php
	source/archiver/common/footer.php
	source/archiver/common/header.php
	source/archiver/forum/viewthread.php
	source/class/block/portal/block_article.php
	source/class/block/portal/block_topic.php
	source/class/class_core.php
	source/class/class_credit.php
	source/class/class_image.php
	source/class/class_member.php
	source/class/class_seccode.php
	source/class/class_task.php
	source/class/class_template.php
	source/class/db/db_driver_mysql_slave.php
	source/class/discuz/discuz_admincp.php
	source/class/discuz/discuz_application.php
	source/class/discuz/discuz_base.php
	source/class/discuz/discuz_censor.php
	source/class/discuz/discuz_cron.php
	source/class/discuz/discuz_database.php
	source/class/discuz/discuz_model.php
	source/class/discuz/discuz_table.php
	source/class/discuz/discuz_table_archive.php
	source/class/forum/forum_upload.php
	source/class/helper/helper_dbtool.php
	source/class/helper/helper_form.php
	source/class/helper/helper_mobile.php
	source/class/helper/helper_notification.php
	source/class/helper/helper_page.php
	source/class/helper/helper_seo.php
	source/class/helper/helper_sysmessage.php
	source/class/helper/helper_util.php
	source/class/memory/memory_driver_eaccelerator.php
	source/class/table/table_common_adminnote.php
	source/class/table/table_common_block_item_data.php
	source/class/table/table_common_card_log.php
	source/class/table/table_common_credit_log.php
	source/class/table/table_common_cron.php
	source/class/table/table_common_failedlogin.php
	source/class/table/table_common_magiclog.php
	source/class/table/table_common_member.php
	source/class/table/table_common_member_count.php
	source/class/table/table_common_member_crime.php
	source/class/table/table_common_member_verify_info.php
	source/class/table/table_common_nav.php
	source/class/table/table_common_plugin.php
	source/class/table/table_common_setting.php
	source/class/table/table_common_usergroup.php
	source/class/table/table_custom_usefullinks.php
	source/class/table/table_forum_collection.php
	source/class/table/table_forum_debatepost.php
	source/class/table/table_forum_faq.php
	source/class/table/table_forum_forum.php
	source/class/table/table_forum_groupuser.php
	source/class/table/table_forum_post.php
	source/class/table/table_forum_postcomment.php
	source/class/table/table_forum_ratelog.php
	source/class/table/table_forum_statlog.php
	source/class/table/table_forum_thread.php
	source/class/table/table_forum_threadimage.php
	source/class/table/table_home_blacklist.php
	source/class/table/table_home_blog.php
	source/class/table/table_home_comment.php
	source/class/table/table_home_notification.php
	source/class/table/table_home_visitor.php
	source/class/table/table_portal_article_title.php
	source/class/table/table_portal_topic.php
	source/discuz_version.php
	source/function/cache/cache_advs.php
	source/function/cache/cache_forums.php
	source/function/cache/cache_plugin.php
	source/function/cache/cache_portalcategory.php
	source/function/cache/cache_setting.php
	source/function/cache/cache_styles.php
	source/function/cache/cache_usergroups.php
	source/function/function_admincp.php
	source/function/function_blog.php
	source/function/function_cache.php
	source/function/function_cloudaddons.php
	source/function/function_collection.php
	source/function/function_comment.php
	source/function/function_core.php
	source/function/function_credit.php
	source/function/function_delete.php
	source/function/function_discuzcode.php
	source/function/function_editor.php
	source/function/function_exif.php
	source/function/function_filesock.php
	source/function/function_forum.php
	source/function/function_forumlist.php
	source/function/function_group.php
	source/function/function_home.php
	source/function/function_member.php
	source/function/function_message.php
	source/function/function_misc.php
	source/function/function_plugin.php
	source/function/function_portal.php
	source/function/function_post.php
	source/function/function_profile.php
	source/function/function_seccode.php
	source/function/function_share.php
	source/function/function_space.php
	source/function/function_threadsort.php
	source/include/collection/collection_comment.php
	source/include/collection/collection_index.php
	source/include/collection/collection_view.php
	source/include/cron/cron_cleanup_daily.php
	source/include/cron/cron_todaypost_daily.php
	source/include/misc/misc_category.php
	source/include/misc/misc_emailcheck.php
	source/include/modcp/modcp_member.php
	source/include/modcp/modcp_moderate.php
	source/include/portalcp/portalcp_article.php
	source/include/portalcp/portalcp_block.php
	source/include/portalcp/portalcp_portalblock.php
	source/include/post/post_editpost.php
	source/include/post/post_newreply.php
	source/include/post/post_newthread.php
	source/include/post/post_newtrade.php
	source/include/space/space_activity.php
	source/include/space/space_blog.php
	source/include/space/space_favorite.php
	source/include/space/space_index.php
	source/include/space/space_notice.php
	source/include/space/space_pm.php
	source/include/space/space_thread.php
	source/include/spacecp/spacecp_album.php
	source/include/spacecp/spacecp_click.php
	source/include/spacecp/spacecp_credit.php
	source/include/spacecp/spacecp_credit_base.php
	source/include/spacecp/spacecp_credit_log.php
	source/include/spacecp/spacecp_doing.php
	source/include/spacecp/spacecp_favorite.php
	source/include/spacecp/spacecp_follow.php
	source/include/spacecp/spacecp_friend.php
	source/include/spacecp/spacecp_profile.php
	source/include/spacecp/spacecp_share.php
	source/include/spacecp/spacecp_usergroup.php
	source/include/thread/thread_poll.php
	source/include/thread/thread_printable.php
	source/include/topicadmin/topicadmin_banpost.php
	source/include/topicadmin/topicadmin_copy.php
	source/include/topicadmin/topicadmin_delcomment.php
	source/include/topicadmin/topicadmin_delpost.php
	source/include/topicadmin/topicadmin_merge.php
	source/include/topicadmin/topicadmin_moderate.php
	source/include/topicadmin/topicadmin_refund.php
	source/include/topicadmin/topicadmin_removereward.php
	source/include/topicadmin/topicadmin_split.php
	source/include/topicadmin/topicadmin_stamp.php
	source/include/topicadmin/topicadmin_stamplist.php
	source/include/topicadmin/topicadmin_stickreply.php
	source/include/topicadmin/topicadmin_warn.php
	source/language/forum/lang_misc.php
	source/language/forum/lang_modaction.php
	source/language/forum/lang_swfupload.php
	source/language/forum/lang_template.php
	source/language/forum/lang_thread.php
	source/language/group/lang_template.php
	source/language/home/lang_template.php
	source/language/lang_admincp.php
	source/language/lang_admincp_cloud.php
	source/language/lang_admincp_menu.php
	source/language/lang_admincp_msg.php
	source/language/lang_message.php
	source/language/lang_notification.php
	source/language/lang_seccode.php
	source/language/lang_space.php
	source/language/lang_spacecp.php
	source/language/lang_template.php
	source/language/member/lang_template.php
	source/language/mobile/lang_template.php
	source/language/portal/lang_template.php
	source/language/ranklist/lang_navtitle.php
	source/module/forum/forum_ajax.php
	source/module/forum/forum_attachment.php
	source/module/forum/forum_forumdisplay.php
	source/module/forum/forum_group.php
	source/module/forum/forum_guide.php
	source/module/forum/forum_image.php
	source/module/forum/forum_index.php
	source/module/forum/forum_misc.php
	source/module/forum/forum_post.php
	source/module/forum/forum_rss.php
	source/module/forum/forum_topicadmin.php
	source/module/forum/forum_viewthread.php
	source/module/home/home_follow.php
	source/module/home/home_magic.php
	source/module/home/home_spacecp.php
	source/module/member/member_connect_logging.php
	source/module/member/member_connect_register.php
	source/module/misc/misc_buyinvitecode.php
	source/module/misc/misc_invite.php
	source/module/misc/misc_patch.php
	source/module/misc/misc_seccode.php
	source/module/misc/misc_stat.php
	source/module/misc/misc_swfupload.php
	source/module/portal/portal_comment.php
	source/module/portal/portal_index.php
	source/module/portal/portal_list.php
	source/module/portal/portal_topic.php
	source/module/portal/portal_view.php
	source/module/search/search_collection.php
	source/module/search/search_group.php
	source/module/search/search_my.php
	source/plugin/mobile/api/1/checkpost.php
	source/plugin/mobile/api/1/connect.php
	source/plugin/mobile/api/1/favthread.php
	source/plugin/mobile/api/1/forumdisplay.php
	source/plugin/mobile/api/1/forumnav.php
	source/plugin/mobile/api/1/hotforum.php
	source/plugin/mobile/api/1/hotthread.php
	source/plugin/mobile/api/1/login.php
	source/plugin/mobile/api/1/mypm.php
	source/plugin/mobile/api/1/mythread.php
	source/plugin/mobile/api/1/newthread.php
	source/plugin/mobile/api/1/profile.php
	source/plugin/mobile/api/1/publicpm.php
	source/plugin/mobile/api/1/register.php
	source/plugin/mobile/api/1/seccode.php
	source/plugin/mobile/api/1/secure.php
	source/plugin/mobile/api/1/sendreply.php
	source/plugin/mobile/api/1/sub_checkpost.php
	source/plugin/mobile/api/1/toplist.php
	source/plugin/mobile/api/1/viewthread.php
	source/plugin/mobile/api/2/forumimage.php
	source/plugin/mobile/api/2/modcp.php
	source/plugin/mobile/api/2/mynotelist.php
	source/plugin/mobile/api/2/pollvote.php
	source/plugin/mobile/api/2/topicadmin.php
	source/plugin/mobile/api/2/uploadavatar.php
	source/plugin/mobile/check.php
	source/plugin/mobile/discuz_plugin_mobile.xml
	source/plugin/mobile/extends/mobile_extends_check.php
	source/plugin/mobile/extends/mobile_extends_list.php
	source/plugin/mobile/extends/module/dz_digest.php
	source/plugin/mobile/extends/module/dz_newreply.php
	source/plugin/mobile/extends/module/dz_newthread.php
	source/plugin/mobile/install.php
	source/plugin/mobile/mobile.class.php
	source/plugin/mobile/mobile.php
	source/plugin/mobile/mobile_extends.php
	source/plugin/mobile/table/table_common_devicetoken.php
	source/plugin/mobile/table/table_mobile_setting.php
	source/plugin/mobile/upgrade.php
	source/plugin/soso_smilies/discuz_plugin_soso_smilies.xml
	static/image/admincp/admincp.css
	static/image/common/collapsed_no.gif
	static/image/common/collapsed_yes.gif
	static/image/common/forum.gif
	static/image/common/forum_new.gif
	static/image/common/qmenu.png
	static/image/common/scrolltop.png
	static/image/common/search.png
	static/image/editor/editor.gif
	static/image/editor/editor_base.js
	static/js/admincp.js
	static/js/at.js
	static/js/bbcode.js
	static/js/common.js
	static/js/common_extra.js
	static/js/editor.js
	static/js/forum.js
	static/js/forum_post.js
	static/js/forum_viewthread.js
	static/js/handlers.js
	static/js/home.js
	static/js/home_drag.js
	static/js/home_uploadpic.js
	static/js/portal.js
	static/js/portal_upload.js
	static/js/register.js
	static/js/swfupload.js
	static/topic/t3/images/title.png
	static/topic/t3/preview.jpg
	static/topic/t3/style.css
	template/default
	uc_client
Merge branch 'makeitcount' of github.com:Magillusionalgame/dps_DiscuzX into makeitcount

Conflicts:
	api/addons/channel.htm
	api/manyou/Service/Client/Message.php
	api/manyou/Service/Client/Notification.php
	api/manyou/Service/Client/OAuth.php
	api/manyou/Service/Connect.php
	api/manyou/Service/DiscuzTips.php
	api/manyou/Service/Disk.php
	api/manyou/Service/SearchHelper.php
	api/manyou/Service/Security.php
	api/manyou/Service/Server/Security.php
	api/manyou/Service/Util.php
	api/manyou/channel.htm
	api/manyou/getmaillist.htm
	api/mobile/index.php
	api/remote/mod/mod_index.php
	api/trade/api_tenpay.php
	develop/include/export.php
	develop/include/hooklist.php
	develop/include/list.php
	develop/include/regplugin.php
	develop/include/script.php
	develop/include/setting.php
	develop/plugin.lang.php
	develop/plugin.php
	develop/template/ajax.htm
	develop/template/common.js
	develop/template/common/developer.css
	develop/template/common/footer.htm
	develop/template/common/header.htm
	develop/template/common/showmessage.htm
	develop/template/language.htm
	develop/template/list.htm
	develop/template/nav.htm
	develop/template/plugin.htm
	develop/template/script.htm
	favicon.ico
	install/data/common_district_1.sql
	install/data/common_district_2.sql
	install/data/common_district_3.sql
	install/data/group_index.xml
	install/data/install.sql
	install/data/install_data.sql
	install/include/install_extvar.php
	install/include/install_function.php
	install/include/install_lang.php
	install/include/install_var.php
	install/index.php
	source/admincp/admincp_admingroup.php
	source/admincp/admincp_adv.php
	source/admincp/admincp_announce.php
	source/admincp/admincp_article.php
	source/admincp/admincp_blockstyle.php
	source/admincp/admincp_blog.php
	source/admincp/admincp_checktools.php
	source/admincp/admincp_cloudaddons.php
	source/admincp/admincp_collection.php
	source/admincp/admincp_counter.php
	source/admincp/admincp_credits.php
	source/admincp/admincp_db.php
	source/admincp/admincp_domain.php
	source/admincp/admincp_ec.php
	source/admincp/admincp_feed.php
	source/admincp/admincp_forums.php
	source/admincp/admincp_group.php
	source/admincp/admincp_login.php
	source/admincp/admincp_magics.php
	source/admincp/admincp_main.php
	source/admincp/admincp_medals.php
	source/admincp/admincp_members.php
	source/admincp/admincp_membersplit.php
	source/admincp/admincp_menu.php
	source/admincp/admincp_misc.php
	source/admincp/admincp_moderate.php
	source/admincp/admincp_nav.php
	source/admincp/admincp_plugins.php
	source/admincp/admincp_portalcategory.php
	source/admincp/admincp_prune.php
	source/admincp/admincp_setting.php
	source/admincp/admincp_styles.php
	source/admincp/admincp_tasks.php
	source/admincp/admincp_threadtypes.php
	source/admincp/admincp_topic.php
	source/admincp/admincp_usergroups.php
	source/admincp/cloud/cloud_qqgroup.php
	source/admincp/cloud/cloud_security.php
	source/admincp/discuzdb.md5
	source/admincp/discuzfiles.md5
	source/admincp/discuzhook.dat
	source/admincp/moderate/moderate_comment.php
	source/admincp/moderate/moderate_reply.php
	source/admincp/moderate/moderate_thread.php
	source/archiver/common/footer.php
	source/archiver/common/header.php
	source/archiver/forum/viewthread.php
	source/class/block/portal/block_article.php
	source/class/block/portal/block_topic.php
	source/class/class_core.php
	source/class/class_credit.php
	source/class/class_image.php
	source/class/class_member.php
	source/class/class_seccode.php
	source/class/class_task.php
	source/class/class_template.php
	source/class/db/db_driver_mysql_slave.php
	source/class/discuz/discuz_admincp.php
	source/class/discuz/discuz_application.php
	source/class/discuz/discuz_base.php
	source/class/discuz/discuz_censor.php
	source/class/discuz/discuz_cron.php
	source/class/discuz/discuz_database.php
	source/class/discuz/discuz_model.php
	source/class/discuz/discuz_table.php
	source/class/discuz/discuz_table_archive.php
	source/class/forum/forum_upload.php
	source/class/helper/helper_dbtool.php
	source/class/helper/helper_form.php
	source/class/helper/helper_mobile.php
	source/class/helper/helper_notification.php
	source/class/helper/helper_page.php
	source/class/helper/helper_seo.php
	source/class/helper/helper_sysmessage.php
	source/class/helper/helper_util.php
	source/class/memory/memory_driver_eaccelerator.php
	source/class/table/table_common_adminnote.php
	source/class/table/table_common_block_item_data.php
	source/class/table/table_common_card_log.php
	source/class/table/table_common_credit_log.php
	source/class/table/table_common_cron.php
	source/class/table/table_common_failedlogin.php
	source/class/table/table_common_magiclog.php
	source/class/table/table_common_member.php
	source/class/table/table_common_member_count.php
	source/class/table/table_common_member_crime.php
	source/class/table/table_common_member_verify_info.php
	source/class/table/table_common_nav.php
	source/class/table/table_common_plugin.php
	source/class/table/table_common_setting.php
	source/class/table/table_common_usergroup.php
	source/class/table/table_custom_usefullinks.php
	source/class/table/table_forum_collection.php
	source/class/table/table_forum_debatepost.php
	source/class/table/table_forum_faq.php
	source/class/table/table_forum_forum.php
	source/class/table/table_forum_groupuser.php
	source/class/table/table_forum_post.php
	source/class/table/table_forum_postcomment.php
	source/class/table/table_forum_ratelog.php
	source/class/table/table_forum_statlog.php
	source/class/table/table_forum_thread.php
	source/class/table/table_forum_threadimage.php
	source/class/table/table_home_blacklist.php
	source/class/table/table_home_blog.php
	source/class/table/table_home_comment.php
	source/class/table/table_home_notification.php
	source/class/table/table_home_visitor.php
	source/class/table/table_portal_article_title.php
	source/class/table/table_portal_topic.php
	source/discuz_version.php
	source/function/cache/cache_advs.php
	source/function/cache/cache_forums.php
	source/function/cache/cache_plugin.php
	source/function/cache/cache_portalcategory.php
	source/function/cache/cache_setting.php
	source/function/cache/cache_styles.php
	source/function/cache/cache_usergroups.php
	source/function/function_admincp.php
	source/function/function_blog.php
	source/function/function_cache.php
	source/function/function_cloudaddons.php
	source/function/function_collection.php
	source/function/function_comment.php
	source/function/function_core.php
	source/function/function_credit.php
	source/function/function_delete.php
	source/function/function_discuzcode.php
	source/function/function_editor.php
	source/function/function_exif.php
	source/function/function_filesock.php
	source/function/function_forum.php
	source/function/function_forumlist.php
	source/function/function_group.php
	source/function/function_home.php
	source/function/function_member.php
	source/function/function_message.php
	source/function/function_misc.php
	source/function/function_plugin.php
	source/function/function_portal.php
	source/function/function_post.php
	source/function/function_profile.php
	source/function/function_seccode.php
	source/function/function_share.php
	source/function/function_space.php
	source/function/function_threadsort.php
	source/include/collection/collection_comment.php
	source/include/collection/collection_index.php
	source/include/collection/collection_view.php
	source/include/cron/cron_cleanup_daily.php
	source/include/cron/cron_todaypost_daily.php
	source/include/misc/misc_category.php
	source/include/misc/misc_emailcheck.php
	source/include/modcp/modcp_member.php
	source/include/modcp/modcp_moderate.php
	source/include/portalcp/portalcp_article.php
	source/include/portalcp/portalcp_block.php
	source/include/portalcp/portalcp_portalblock.php
	source/include/post/post_editpost.php
	source/include/post/post_newreply.php
	source/include/post/post_newthread.php
	source/include/post/post_newtrade.php
	source/include/space/space_activity.php
	source/include/space/space_blog.php
	source/include/space/space_favorite.php
	source/include/space/space_index.php
	source/include/space/space_notice.php
	source/include/space/space_pm.php
	source/include/space/space_thread.php
	source/include/spacecp/spacecp_album.php
	source/include/spacecp/spacecp_click.php
	source/include/spacecp/spacecp_credit.php
	source/include/spacecp/spacecp_credit_base.php
	source/include/spacecp/spacecp_credit_log.php
	source/include/spacecp/spacecp_doing.php
	source/include/spacecp/spacecp_favorite.php
	source/include/spacecp/spacecp_follow.php
	source/include/spacecp/spacecp_friend.php
	source/include/spacecp/spacecp_profile.php
	source/include/spacecp/spacecp_share.php
	source/include/spacecp/spacecp_usergroup.php
	source/include/thread/thread_poll.php
	source/include/thread/thread_printable.php
	source/include/topicadmin/topicadmin_banpost.php
	source/include/topicadmin/topicadmin_copy.php
	source/include/topicadmin/topicadmin_delcomment.php
	source/include/topicadmin/topicadmin_delpost.php
	source/include/topicadmin/topicadmin_merge.php
	source/include/topicadmin/topicadmin_moderate.php
	source/include/topicadmin/topicadmin_refund.php
	source/include/topicadmin/topicadmin_removereward.php
	source/include/topicadmin/topicadmin_split.php
	source/include/topicadmin/topicadmin_stamp.php
	source/include/topicadmin/topicadmin_stamplist.php
	source/include/topicadmin/topicadmin_stickreply.php
	source/include/topicadmin/topicadmin_warn.php
	source/language/forum/lang_misc.php
	source/language/forum/lang_modaction.php
	source/language/forum/lang_swfupload.php
	source/language/forum/lang_template.php
	source/language/forum/lang_thread.php
	source/language/group/lang_template.php
	source/language/home/lang_template.php
	source/language/lang_admincp.php
	source/language/lang_admincp_cloud.php
	source/language/lang_admincp_menu.php
	source/language/lang_admincp_msg.php
	source/language/lang_message.php
	source/language/lang_notification.php
	source/language/lang_seccode.php
	source/language/lang_space.php
	source/language/lang_spacecp.php
	source/language/lang_template.php
	source/language/member/lang_template.php
	source/language/mobile/lang_template.php
	source/language/portal/lang_template.php
	source/language/ranklist/lang_navtitle.php
	source/module/forum/forum_ajax.php
	source/module/forum/forum_attachment.php
	source/module/forum/forum_forumdisplay.php
	source/module/forum/forum_group.php
	source/module/forum/forum_guide.php
	source/module/forum/forum_image.php
	source/module/forum/forum_index.php
	source/module/forum/forum_misc.php
	source/module/forum/forum_post.php
	source/module/forum/forum_rss.php
	source/module/forum/forum_topicadmin.php
	source/module/forum/forum_viewthread.php
	source/module/home/home_follow.php
	source/module/home/home_magic.php
	source/module/home/home_spacecp.php
	source/module/member/member_connect_logging.php
	source/module/member/member_connect_register.php
	source/module/misc/misc_buyinvitecode.php
	source/module/misc/misc_invite.php
	source/module/misc/misc_patch.php
	source/module/misc/misc_seccode.php
	source/module/misc/misc_stat.php
	source/module/misc/misc_swfupload.php
	source/module/portal/portal_comment.php
	source/module/portal/portal_index.php
	source/module/portal/portal_list.php
	source/module/portal/portal_topic.php
	source/module/portal/portal_view.php
	source/module/search/search_collection.php
	source/module/search/search_group.php
	source/module/search/search_my.php
	source/plugin/mobile/api/1/checkpost.php
	source/plugin/mobile/api/1/connect.php
	source/plugin/mobile/api/1/favthread.php
	source/plugin/mobile/api/1/forumdisplay.php
	source/plugin/mobile/api/1/forumnav.php
	source/plugin/mobile/api/1/hotforum.php
	source/plugin/mobile/api/1/hotthread.php
	source/plugin/mobile/api/1/login.php
	source/plugin/mobile/api/1/mypm.php
	source/plugin/mobile/api/1/mythread.php
	source/plugin/mobile/api/1/newthread.php
	source/plugin/mobile/api/1/profile.php
	source/plugin/mobile/api/1/publicpm.php
	source/plugin/mobile/api/1/register.php
	source/plugin/mobile/api/1/seccode.php
	source/plugin/mobile/api/1/secure.php
	source/plugin/mobile/api/1/sendreply.php
	source/plugin/mobile/api/1/sub_checkpost.php
	source/plugin/mobile/api/1/toplist.php
	source/plugin/mobile/api/1/viewthread.php
	source/plugin/mobile/api/2/forumimage.php
	source/plugin/mobile/api/2/modcp.php
	source/plugin/mobile/api/2/mynotelist.php
	source/plugin/mobile/api/2/pollvote.php
	source/plugin/mobile/api/2/topicadmin.php
	source/plugin/mobile/api/2/uploadavatar.php
	source/plugin/mobile/check.php
	source/plugin/mobile/discuz_plugin_mobile.xml
	source/plugin/mobile/extends/mobile_extends_check.php
	source/plugin/mobile/extends/mobile_extends_list.php
	source/plugin/mobile/extends/module/dz_digest.php
	source/plugin/mobile/extends/module/dz_newreply.php
	source/plugin/mobile/extends/module/dz_newthread.php
	source/plugin/mobile/install.php
	source/plugin/mobile/mobile.class.php
	source/plugin/mobile/mobile.php
	source/plugin/mobile/mobile_extends.php
	source/plugin/mobile/table/table_common_devicetoken.php
	source/plugin/mobile/table/table_mobile_setting.php
	source/plugin/mobile/upgrade.php
	source/plugin/soso_smilies/discuz_plugin_soso_smilies.xml
	static/image/admincp/admincp.css
	static/image/common/collapsed_no.gif
	static/image/common/collapsed_yes.gif
	static/image/common/forum.gif
	static/image/common/forum_new.gif
	static/image/common/qmenu.png
	static/image/common/scrolltop.png
	static/image/common/search.png
	static/image/editor/editor.gif
	static/image/editor/editor_base.js
	static/js/admincp.js
	static/js/at.js
	static/js/bbcode.js
	static/js/common.js
	static/js/common_extra.js
	static/js/editor.js
	static/js/forum.js
	static/js/forum_post.js
	static/js/forum_viewthread.js
	static/js/handlers.js
	static/js/home.js
	static/js/home_drag.js
	static/js/home_uploadpic.js
	static/js/portal.js
	static/js/portal_upload.js
	static/js/register.js
	static/js/swfupload.js
	static/topic/t3/images/title.png
	static/topic/t3/preview.jpg
	static/topic/t3/style.css
	template/default
	uc_client
Merge commit '8c3a9e' into makeitcount
修正编码问题
修正升级时的数据库名问题
增加备用功能
删除多余文件