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
Piwigo · Jun 14, 2011 · fcda519 · fcda519
1 parent cb25d20
commit fcda519
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/admin.php b/admin.php
@@ -156,7 +156,7 @@
     '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',

diff --git a/identification.php b/identification.php
@@ -60,7 +60,7 @@
     $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
@@ -50,7 +50,7 @@
     '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
@@ -30,7 +30,7 @@
   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']))
   {