From 57207cf2ae6b8c12f02cbf23f17e1132a0d03d72 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 14 Jun 2011 12:14:05 +0000
Subject: bug 2344 fixed: all "Go to Home" links depends on the user defined
 "Gallery URL".

git-svn-id: http://piwigo.org/svn/branches/2.2@11367 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin.php               | 2 +-
 identification.php      | 2 +-
 include/page_header.php | 2 +-
 include/user.inc.php    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin.php b/admin.php
index f79540146..524246008 100644
--- a/admin.php
+++ b/admin.php
@@ -149,7 +149,7 @@ $template->assign(
     'U_USERS'=> $link_start.'user_list',
     'U_GROUPS'=> $link_start.'group_list',
     'U_PERMALINKS'=> $link_start.'permalinks',
-    'U_RETURN'=> make_index_url(),
+    'U_RETURN'=> get_gallery_home_url(),
     'U_ADMIN'=> PHPWG_ROOT_PATH.'admin.php',
     'U_LOGOUT'=> PHPWG_ROOT_PATH.'index.php?act=logout',
     'U_PLUGINS'=> $link_start.'plugins_list',
diff --git a/identification.php b/identification.php
index 6d345bf45..02d3012db 100644
--- a/identification.php
+++ b/identification.php
@@ -58,7 +58,7 @@ if (isset($_POST['login']))
     $remember_me = isset($_POST['remember_me']) and $_POST['remember_me']==1;
     if ( try_log_user($_POST['username'], $_POST['password'], $remember_me) )
     {
-      redirect(empty($redirect_to) ? make_index_url() : $redirect_to);
+      redirect(empty($redirect_to) ? get_gallery_home_url() : $redirect_to);
     }
     else
     {
diff --git a/include/page_header.php b/include/page_header.php
index 3d271ebc9..381162dbd 100644
--- a/include/page_header.php
+++ b/include/page_header.php
@@ -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(),
     ));
 
 
diff --git a/include/user.inc.php b/include/user.inc.php
index c6110ecd1..e02c2f9bf 100644
--- a/include/user.inc.php
+++ b/include/user.inc.php
@@ -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']))
   {
-- 
cgit v1.2.3