* change for merge xuanxuan.

2019-11-29 13:15:21 +08:00
parent 7412623596
commit 97f125b3b4
3 changed files with 2 additions and 1 deletions
@@ -118,6 +118,7 @@ zentaoxx:
 	sed -i 's/footer.html.php/footer.lite.html.php/g' zentaoxx/module/common/view/footer.modal.html.php
 	sed -i 's/getAppRoot/getModuleRoot/g' zentaoxx/module/common/view/footer.modal.html.php
 	sed -i 's/v\.//g' zentaoxx/module/im/js/debug.js
+	sed -i 's/helper::jsonEncode(/json_encode(/g' zentaoxx/framework/xuanxuan.class.php
 	sed -i "s/lang->goback,/lang->goback, '',/g" zentaoxx/module/im/view/debug.html.php
 	sed -i 's/v\.//g' zentaoxx/module/client/js/checkupgrade.js
 	sed -i 's/xxb_/zt_/g' zentaoxx/db/*.sql
@@ -12,4 +12,4 @@ display: table-cell;float: none;vertical-align: top;}
 .statusBlock .date h2{font-size:18px;font-weight:500;}
 .statusBlock .server a{padding-top:3px;padding-bottom:3px; background: linear-gradient(#ffffff, #ecf4ff);color:#477cf9;}
 .statisticsBlock .col{height:100px;text-align:center;padding-top:20px;}
-.statisticsBlock .col h2{font-size:30px;font-weight:500;}
+.statisticsBlock .col h2{font-size:18px;font-weight:500;}