Project

General

Profile

« Previous | Next » 

Revision 1605

Added by Dietmar over 12 years ago

login.php fallback to revision 1602

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12

  
13 13
=========================== add small Features 2.8.2 ==========================
14
08 Feb-2012 Build 1605 Dietmar Woellbrink (Luisehahne)
15
! login.php fallback to revision 1602
14 16
08 Feb-2012 Build 1604 Dietmar Woellbrink (Luisehahne)
15 17
# fixed parse error in login.php
16 18
08 Feb-2012 Build 1603 Dietmar Woellbrink (Luisehahne)
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.2');
54
if(!defined('REVISION')) define('REVISION', '1604');
54
if(!defined('REVISION')) define('REVISION', '1605');
55 55
if(!defined('SP')) define('SP', 'SP2');
branches/2.8.x/wb/account/login.php
54 54
// Create new login app
55 55
$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
56 56
$redirect  = strip_tags(isset(${$requestMethod}['redirect']) ? ${$requestMethod}['redirect'] : '');
57
$redirect = ((isset($_SESSION['HTTP_REFERER']) && ($redirect='')) ?  $_SESSION['HTTP_REFERER'] : $redirect);
58
// $_SESSION['HTTP_REFERER'] = str_replace(WB_URL,'',$redirect);
57
$redirect = ((isset($_SERVER['HTTP_REFERER']) && empty($redirect)) ?  $_SERVER['HTTP_REFERER'] : $redirect);
58
$_SESSION['HTTP_REFERER'] = str_replace(WB_URL,'',$redirect);
59 59

  
60 60
$loginUrl  = WB_URL.'/account/login.php';
61
$loginUrl .= (($redirect!='') ? '?redirect=' .$_SESSION['HTTP_REFERER'] : $loginUrl);
61
$loginUrl .= (!empty($redirect) ? '?redirect=' .$_SESSION['HTTP_REFERER'] : '');
62 62

  
63 63
$ThemeUrl  = WB_URL.$wb->correct_theme_source('warning.html');
64 64
// Setup template object, parse vars to it, then parse it

Also available in: Unified diff