iSharkFly-Open
/
DiscuzX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.oschina.net:ComsenzDiscuz/DiscuzX

This commit is contained in:
Discuz! 2017-02-17 16:15:14 +08:00
parent e419966f5f e68d9174cf
commit b749d905bd
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -19,3 +19,6 @@ X3.3 将提高 Release 的更新频率，以 10 天为单位更新一次 Release
- DiscuzFans：https://git.oschina.net/sinlody/DiscuzFans
- DiscuzLite：https://git.oschina.net/3dming/DiscuzL
### **DxGit Forker 交流群**
[QQ群 62652633](http://shang.qq.com/wpa/qunwpa?idkey=5c7c9ff98ebd001751bcda84b47c77830c554f729c72c247957cd86bdd83aa47) 本群仅限 Fork 本 Git 的用户加入，入群请提供您 Fork 的地址

4
upload/source/module/forum/forum_forumdisplay.php
View File

@ -89,7 +89,6 @@ if($_G['forum']['type'] == 'forum') {
}
$rssauth = $_G['rssauth'];
$rsshead = $_G['setting']['rssstatus'] ? ('<link rel="alternate" type="application/rss+xml" title="'.$_G['setting']['bbname'].' - '.$navtitle.'" href="'.$_G['siteurl'].'forum.php?mod=rss&fid='.$_G['fid'].'&amp;auth='.$rssauth."\" />\n") : '';
$forumseoset = array(
'seotitle' => $_G['forum']['seotitle'],
@ -148,6 +147,9 @@ $_GET['typeid'] = intval($_GET['typeid']);
if(!empty($_GET['typeid']) && !empty($_G['forum']['threadtypes']['types'][$_GET['typeid']])) {
$navtitle = strip_tags($_G['forum']['threadtypes']['types'][$_GET['typeid']]).' - '.$navtitle;
}
$rsshead = $_G['setting']['rssstatus'] ? ('<link rel="alternate" type="application/rss+xml" title="'.$_G['setting']['bbname'].' - '.$navtitle.'" href="'.$_G['siteurl'].'forum.php?mod=rss&fid='.$_G['fid'].'&amp;auth='.$rssauth."\" />\n") : '';
if(!$metakeywords) {
$metakeywords = $_G['forum']['name'];
}