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
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
-4
View File
@@ -114,10 +114,6 @@ if (isset($_POST['submit']) and !is_adviser())
{
case 'main' :
{
if ( !url_is_remote($_POST['gallery_url']) )
{
array_push($page['errors'], l10n('The gallery URL is not valid.'));
}
foreach( $main_checkboxes as $checkbox)
{
$_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true';