aboutsummaryrefslogtreecommitdiffstats
path: root/feed.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2010-05-28 19:58:51 +0000
committerrvelices <rv-github@modusoptimus.com>2010-05-28 19:58:51 +0000
commit722c4a3a9740506ed4f409fcd9517027f8cbcee5 (patch)
treef2df91637c418d6aacf07a4059fbe0a8923167cf /feed.php
parentef50e468d4f7115e6e9ee7b54165230c8831109f (diff)
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
Diffstat (limited to '')
-rw-r--r--feed.php4
1 files changed, 2 insertions, 2 deletions
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 = '<ul>';