1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00

Bugtracker #4345 - encode ampersands in feed links. Fix template

This commit is contained in:
e107steved
2008-05-30 20:36:47 +00:00
parent dcca1f544e
commit 822e811bd9
3 changed files with 13 additions and 11 deletions

View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/newsfeed/newsfeed.php,v $
| $Revision: 1.1.1.1 $
| $Date: 2006-12-02 04:35:31 $
| $Author: mcfly_e107 $
| $Revision: 1.2 $
| $Date: 2008-05-30 20:36:38 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
require_once("../../class2.php");
@@ -132,6 +132,7 @@ if($action == "show")
else
{
$FEEDITEMLINK = "<a href='".$item['link']."' rel='external'>".$tp -> toHTML($item['title'], TRUE)."</a>\n";
$FEEDITEMLINK = str_replace('&', '&amp;', $FEEDITEMLINK);
$feeditemtext = preg_replace("#\[[a-z0-9=]+\]|\[\/[a-z]+\]|\{[A-Z_]+\}#si", "", $item['description']);
$FEEDITEMTEXT = $tp -> toHTML($feeditemtext, TRUE)."\n";
}

View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/newsfeed/newsfeed_functions.php,v $
| $Revision: 1.3 $
| $Date: 2008-01-20 04:46:35 $
| $Author: mcfly_e107 $
| $Revision: 1.4 $
| $Date: 2008-05-30 20:36:38 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -169,6 +169,7 @@ if(!function_exists("newsfeed_info"))
{
$item = $item_total[$i];
$FEEDITEMLINK = "<a href='".$item['link']."' rel='external'>".$tp -> toHTML($item['title'], TRUE)."</a>\n";
$FEEDITEMLINK = str_replace('&', '&amp;', $FEEDITEMLINK);
$feeditemtext = preg_replace("#\[[a-z0-9=]+\]|\[\/[a-z]+\]|\{[A-Z_]+\}#si", "", strip_tags($item['description']));
$FEEDITEMTEXT = $tp->text_truncate($feeditemtext, $truncate, $truncate_string);

View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/newsfeed/templates/newsfeed_template.php,v $
| $Revision: 1.1.1.1 $
| $Date: 2006-12-02 04:35:31 $
| $Author: mcfly_e107 $
| $Revision: 1.2 $
| $Date: 2008-05-30 20:36:39 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -52,11 +52,11 @@ $NEWSFEED_MAIN_END = "
</tr>
<tr>
<td class='forumheader3' style='text-align: right;'><span class='smalltext'>{FEEDCOPYRIGHT} | {FEEDLASTBUILDDATE}</td>
<td class='forumheader3' style='text-align: right;'><span class='smalltext'>{FEEDCOPYRIGHT} | {FEEDLASTBUILDDATE}</span></td>
</tr>
<tr>
<td class='forumheader3' style='text-align: center;'><span class='smalltext'>{BACKLINK}</td>
<td class='forumheader3' style='text-align: center;'><span class='smalltext'>{BACKLINK}</span></td>
</tr>
</table>\n";