mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-26 11:19:55 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge r6368,6410 from branch-2.1 to trunk

Browse source 
- 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
This commit is contained in:
rvelices 2010-05-28 19:58:51 +00:00
parent ef50e468d4
commit 722c4a3a97
10 changed files with 55 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

4
feed.php
View file

@ -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>';