Changeset 11368

Timestamp:

Jun 14, 2011, 2:14:29 PM (13 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:

• admin.php (modified) (1 diff)
• identification.php (modified) (1 diff)
• include/page_header.php (modified) (1 diff)
• include/user.inc.php (modified) (1 diff)

trunk/admin.php

@@ -157 +157 @@
     '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',

trunk/identification.php

@@ -61 +61 @@
     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

trunk/include/page_header.php

@@ -51 +51 @@
     'PAGE_TITLE' => strip_tags($title),
 
-    'U_HOME' => make_index_url(),
+    'U_HOME' => get_gallery_home_url(),
     ));
 

trunk/include/user.inc.php

@@ -31 +31 @@
   { // logout
     logout_user();
-    redirect(make_index_url());
+    redirect(get_gallery_home_url());
   }
   elseif (!empty($_SESSION['pwg_uid']))