From 3c3c689db9b8913a9127eca92ec0808d97c35e35 Mon Sep 17 00:00:00 2001
From: Comsenz <10433182@qq.com>
Date: Thu, 28 Dec 2017 14:42:28 +0800
Subject: [PATCH] release 20180101

---
 readme/changelog.txt             | 24 ++++++++++++++++++------
 upload/source/discuz_version.php |  2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/readme/changelog.txt b/readme/changelog.txt
index 4d78272..cf0f57d 100644
--- a/readme/changelog.txt
+++ b/readme/changelog.txt
@@ -1,14 +1,26 @@
++======================================+
+   Discuz! X3.4 Release 20180101
++======================================+
+增加 HTML版头像上传机制
+优化 Media改成扩展形式
+
++======================================+
+   Discuz! X3.4 Release 20171001
++======================================+
+优化 去除云平台
+增加 新触屏版（本地化微社区前端）
+
 +======================================+
    Discuz! X3.3 Release 20170401
 +======================================+
-鍏煎 PHP7
-浼樺寲 SQL鏌ヨ
-淇 瀹夊叏闂
-浼樺寲 浼樺寲缂撳瓨鏈哄埗鏀逛负鎵╁睍褰㈠紡锛屽彲鑷敱鎵╁睍
-鏂板 APCu銆乊ac銆佹枃浠剁紦瀛橈紝鏂囦欢缂撳瓨榛樿寮�鍚�
+兼容 PHP7
+优化 SQL查询
+修复 安全问题
+优化 优化缓存机制改为扩展形式，可自由扩展
+新增 APCu、Yac、文件缓存，文件缓存默认开启
 
 +--------------------------------------+
-寰�鏃ョ増鏈�( Old Version )
+往日版本( Old Version )
 +--------------------------------------+
 Discuz! X1 Beta Release 20100501
 Discuz! X1 Release 20100518
diff --git a/upload/source/discuz_version.php b/upload/source/discuz_version.php
index 3fb5f1a..8ef7e1a 100644
--- a/upload/source/discuz_version.php
+++ b/upload/source/discuz_version.php
@@ -13,7 +13,7 @@ if(!defined('IN_DISCUZ')) {
 
 if(!defined('DISCUZ_VERSION')) {
 	define('DISCUZ_VERSION', 'X3.4');
-	define('DISCUZ_RELEASE', '20171001');
+	define('DISCUZ_RELEASE', '20180101');
 	define('DISCUZ_FIXBUG', '34000000');
 }