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

Merge pull request !50 from Hex/patch-5

This commit is contained in:
Hex 2017-02-17 16:00:19 +08:00 committed by Discuz!
parent b3706436db c4699011c3
commit e68d9174cf
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,6 @@ if($_G['forum']['type'] == 'forum') {
} }
$rssauth = $_G['rssauth']; $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( $forumseoset = array(
'seotitle' => $_G['forum']['seotitle'], 'seotitle' => $_G['forum']['seotitle'],
@ -148,6 +147,9 @@ $_GET['typeid'] = intval($_GET['typeid']);
if(!empty($_GET['typeid']) && !empty($_G['forum']['threadtypes']['types'][$_GET['typeid']])) { if(!empty($_GET['typeid']) && !empty($_G['forum']['threadtypes']['types'][$_GET['typeid']])) {
$navtitle = strip_tags($_G['forum']['threadtypes']['types'][$_GET['typeid']]).' - '.$navtitle; $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) { if(!$metakeywords) {
$metakeywords = $_G['forum']['name']; $metakeywords = $_G['forum']['name'];
} }