Changeset 398

Show
Ignore:
Timestamp:
2010-04-05 15:39:04 (2 years ago)
Author:
hannes
Message:

merging changeset [397] (no new session when visiting the admin panel) from trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r370 r398  
    970970        $q->execute(); 
    971971        $q = NULL; 
    972         // regenerate ID in order to ensure privileged session hasn't been fixed in advance 
    973         session_regenerate_id(); 
     972        if ($admin != 1) { 
     973            // regenerate ID in order to ensure privileged session hasn't been fixed in advance 
     974            session_regenerate_id(); 
     975        } 
    974976        $_SESSION['memberid'] = $row->memberid; 
    975977        $_SESSION['membername'] = $username;