aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2009-04-26 15:00:57 +0000
committerrub <rub@piwigo.org>2009-04-26 15:00:57 +0000
commitef20fa17b5c6da034f57db52b1a2f198059762d9 (patch)
tree10d181627afb82d0f6a9a49acad2ebc05079ee23
parentf81888fc2e3434e744c68151609ace404ad3e399 (diff)
merge -c3257 from trunk to branch 2.0
Rollback "Missing <ul> on NBM" in order to dd <ul> on feed too. git-svn-id: http://piwigo.org/svn/branches/2.0@3258 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/functions_notification.inc.php4
-rw-r--r--template/yoga/mail/text/html/notification_by_mail.tpl2
2 files changed, 4 insertions, 2 deletions
diff --git a/include/functions_notification.inc.php b/include/functions_notification.inc.php
index 885dba6e6..dc955ec20 100644
--- a/include/functions_notification.inc.php
+++ b/include/functions_notification.inc.php
@@ -522,7 +522,7 @@ function get_html_description_recent_post_date($date_detail)
{
global $conf;
- $description = '';
+ $description = '<ul>';
$description .=
'<li>'
@@ -564,6 +564,8 @@ function get_html_description_recent_post_date($date_detail)
}
$description .= '</ul>';
+ $description .= '</ul>';
+
return $description;
}
diff --git a/template/yoga/mail/text/html/notification_by_mail.tpl b/template/yoga/mail/text/html/notification_by_mail.tpl
index ae3708f41..52627ebe4 100644
--- a/template/yoga/mail/text/html/notification_by_mail.tpl
+++ b/template/yoga/mail/text/html/notification_by_mail.tpl
@@ -51,7 +51,7 @@
<div id="nbm_recent_post">
{foreach from=$recent_posts item=recent_post }
<h2>{$recent_post.TITLE}</h2>
- <ul>{$recent_post.HTML_DATA}</ul>
+ {$recent_post.HTML_DATA}
{/foreach}
{/if}
</div>