diff options
| author | plegall <plg@piwigo.org> | 2011-06-14 12:14:29 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2011-06-14 12:14:29 +0000 |
| commit | fcda5191191c70b613c50c18016b4d6c597183a8 (patch) | |
| tree | a7f0551caec5410d17dc0c2546fb090eaa9cda31 | |
| parent | cb25d20be5d9fb08161803df83c155bdfdb64c29 (diff) | |
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
| -rw-r--r-- | admin.php | 2 | ||||
| -rw-r--r-- | identification.php | 2 | ||||
| -rw-r--r-- | include/page_header.php | 2 | ||||
| -rw-r--r-- | include/user.inc.php | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -156,7 +156,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', diff --git a/identification.php b/identification.php index 00b92603a..92b078458 100644 --- a/identification.php +++ b/identification.php @@ -60,7 +60,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'])) { |