1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-21 05:41:58 +02:00

Fix for forgot password and activation links. Fix for news-edit button. Fix for html5 validation of html code using '&'.

This commit is contained in:
Cameron
2015-04-10 12:36:35 -07:00
parent fe9fe1c3f8
commit 507308208b
5 changed files with 35 additions and 14 deletions

View File

@@ -109,7 +109,7 @@ class news_shortcodes extends e_shortcode
$pref = e107::getPref();
$sql = e107::getDb();
if($this->commentsDisabled)
if($this->commentsDisabled || ($this->commentsEngine != 'e107'))
{
return '';
}
@@ -259,7 +259,7 @@ class news_shortcodes extends e_shortcode
function sc_newscommentlink($parm=null)
{
if($this->commentsDisabled)
if($this->commentsDisabled || ($this->commentsEngine != 'e107'))
{
return;
}
@@ -336,7 +336,7 @@ class news_shortcodes extends e_shortcode
$class = varset($parm['class']);
return "<a class='e-tip ".$class."' rel='external' href='".e_ADMIN_ABS."newspost.php?action=create&amp;sub=edit&amp;id=".$this->news_item['news_id']."' title=\"".LAN_NEWS_25."\">".$adop_icon."</a>\n";
return "<a class='e-tip ".$class."' rel='external' href='".e_ADMIN_ABS."newspost.php?action=edit&amp;id=".$this->news_item['news_id']."' title=\"".LAN_NEWS_25."\">".$adop_icon."</a>\n";
}
else
{