Changeset 370

Show
Ignore:
Timestamp:
2009-10-11 16:31:23 (2 years ago)
Author:
hannes
Message:

merging changeset [369] (fixing reset of new post indicators) from trunk; creating version 5.2.0

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/5.2/classes/misc/Member.php

    r366 r370  
    11601160            if ($_SESSION['pages'] == 1) { 
    11611161                // check if returning user who has saved credentials in cookie 
    1162                 if (isset($_COOKIE['sb_user']) && $_COOKIE['sb_user'] != '') { 
     1162                if ((!isset($_SESSION['memberid']) || $_SESSION['memberid'] == 0) && isset($_COOKIE['sb_user']) && $_COOKIE['sb_user'] != '') { 
    11631163                    // decrypt cookie contents 
    11641164                    $e = new Encryption(); 

  • branches/5.2/classes/pages/Page.php

    r362 r370  
    6363        /* Have some kind of manual per-page login credentials been posted? 
    6464         * This shouldn't be checked on 'Userpanel' page, because there is a special handling of that there. */ 
    65         if ($INPUT['show'] != 'userpanel' && isset($INPUT['user']) && $INPUT['user'] != '' && isset($INPUT['password']) && $INPUT['password'] !='') { 
     65        if ((!isset($_SESSION['memberid']) || $_SESSION['memberid'] == 0) && $INPUT['show'] != 'userpanel' && isset($INPUT['user']) && $INPUT['user'] != '' && isset($INPUT['password']) && $INPUT['password'] !='') { 
    6666            if (Member::authenticate($INPUT['user'], $INPUT['password'])) { 
    6767                // authenticated for this step 

  • branches/5.2/includes/config/version.php

    r359 r370  
    2828 * Also good: Spam Board Viking Edition 1.0 (then, you can do your own version numbering from there) */ 
    2929 
    30 $VERSION = '5.2.0 RC2'; 
     30$VERSION = '5.2.0'; 
    3131 
    3232?>