From 722c4a3a9740506ed4f409fcd9517027f8cbcee5 Mon Sep 17 00:00:00 2001 From: rvelices Date: Fri, 28 May 2010 19:58:51 +0000 Subject: merge r6368,6410 from branch-2.1 to trunk - merged the linkroot integration with the existing gallery_url (unique $conf['gallery_url'] used for RSS, mail homepage root in the browse path) - added an option $conf['debug_mail'] - if set all outgoing mails are saved into local_data_dir git-svn-id: http://piwigo.org/svn/trunk@6411 68402e56-0260-453c-a942-63ccdbb3a9ee --- feed.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'feed.php') diff --git a/feed.php b/feed.php index cfebc8352..642682353 100644 --- a/feed.php +++ b/feed.php @@ -110,7 +110,7 @@ $rss->encoding=get_pwg_charset(); $rss->title = $conf['gallery_title']; $rss->title.= ' (as '.stripslashes($user['username']).')'; -$rss->link = $conf['gallery_url']; +$rss->link = get_gallery_home_url(); // +-----------------------------------------------------------------------+ // | Feed creation | @@ -125,7 +125,7 @@ if (!$image_only) { $item = new FeedItem(); $item->title = sprintf(l10n('New on %s'), format_date($dbnow) ); - $item->link = $conf['gallery_url']; + $item->link = get_gallery_home_url(); // content creation $item->description = '