merge r11367 from branch 2.2 to trunk

bug 2344 fixed: all "Go to Home" links depends on the user defined "Gallery URL".



git-svn-id: http://piwigo.org/svn/trunk@11368 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2011-06-14 12:14:29 +00:00
commit fcda519119
4 changed files with 4 additions and 4 deletions

View file

@ -50,7 +50,7 @@ $template->assign(
'CONTENT_ENCODING' => get_pwg_charset(),
'PAGE_TITLE' => strip_tags($title),
'U_HOME' => make_index_url(),
'U_HOME' => get_gallery_home_url(),
));

View file

@ -30,7 +30,7 @@ if (isset($_COOKIE[session_name()]))
if (isset($_GET['act']) and $_GET['act'] == 'logout')
{ // logout
logout_user();
redirect(make_index_url());
redirect(get_gallery_home_url());
}
elseif (!empty($_SESSION['pwg_uid']))
{