Skip to content

Commit

Permalink
Merge pull request silverstripe#3418 from halkyon/remove_supression
Browse files Browse the repository at this point in the history
Remove @ suppression operator on session_start()
  • Loading branch information
Stig Lindqvist committed Aug 22, 2014
2 parents 0d169d5 + 0b5599e commit c8c1833
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions control/Session.php
Original file line number Diff line number Diff line change
Expand Up @@ -376,10 +376,8 @@ public function inst_start($sid = null) {
// seperate (less secure) session for non-HTTPS requests
if($secure) session_name('SECSESSID');

// @ is to supress win32 warnings/notices when session wasn't cleaned up properly
// There's nothing we can do about this, because it's an operating system function!
if($sid) session_id($sid);
@session_start();
session_start();

$this->data = isset($_SESSION) ? $_SESSION : array();
}
Expand Down

0 comments on commit c8c1833

Please sign in to comment.