Fix bcit-ci#4039

narfbg · narfbg · commit 8df6efd40218 · 2015-12-11T17:55:55.000+02:00
diff --git a/system/libraries/Session/drivers/Session_files_driver.php b/system/libraries/Session/drivers/Session_files_driver.php
@@ -183,6 +183,12 @@ public function read($session_id)
 				return '';
 			}
 		}
+		// We shouldn't need this, but apparently we do ...
+		// See https://github.com/bcit-ci/CodeIgniter/issues/4039
+		elseif ($this->_file_handler === FALSE)
+		{
+			return FALSE;
+		}
 		else
 		{
 			rewind($this->_file_handle);

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,12 @@ public function read($session_id)`
`183`	`183`	`return '';`
`184`	`184`	`}`
`185`	`185`	`}`
	`186`	`+ // We shouldn't need this, but apparently we do ...`
	`187`	`+ // See https://github.com/bcit-ci/CodeIgniter/issues/4039`
	`188`	`+ elseif ($this->_file_handler === FALSE)`
	`189`	`+ {`
	`190`	`+ return FALSE;`
	`191`	`+ }`
`186`	`192`	`else`
`187`	`193`	`{`
`188`	`194`	`rewind($this->_file_handle);`