Changeset 11368


Ignore:
Timestamp:
06/14/11 14:14:29 (8 years ago)
Author:
plg
Message:

merge r11367 from branch 2.2 to trunk

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

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin.php

    r11329 r11368  
    157157    'U_GROUPS'=> $link_start.'group_list', 
    158158    'U_PERMALINKS'=> $link_start.'permalinks', 
    159     'U_RETURN'=> make_index_url(), 
     159    'U_RETURN'=> get_gallery_home_url(), 
    160160    'U_ADMIN'=> PHPWG_ROOT_PATH.'admin.php', 
    161161    'U_LOGOUT'=> PHPWG_ROOT_PATH.'index.php?act=logout', 
  • trunk/identification.php

    r10860 r11368  
    6161    if ( try_log_user($_POST['username'], $_POST['password'], $remember_me) ) 
    6262    { 
    63       redirect(empty($redirect_to) ? make_index_url() : $redirect_to); 
     63      redirect(empty($redirect_to) ? get_gallery_home_url() : $redirect_to); 
    6464    } 
    6565    else 
  • trunk/include/page_header.php

    r8728 r11368  
    5151    'PAGE_TITLE' => strip_tags($title), 
    5252 
    53     'U_HOME' => make_index_url(), 
     53    'U_HOME' => get_gallery_home_url(), 
    5454    )); 
    5555 
  • trunk/include/user.inc.php

    r8728 r11368  
    3131  { // logout 
    3232    logout_user(); 
    33     redirect(make_index_url()); 
     33    redirect(get_gallery_home_url()); 
    3434  } 
    3535  elseif (!empty($_SESSION['pwg_uid'])) 
Note: See TracChangeset for help on using the changeset viewer.