Browse Source

Session fix

Nathaniel van Diepen 11 years ago
parent
commit
0d5949c6e2
2 changed files with 7 additions and 3 deletions
  1. 4 2
      php/config.php
  2. 3 1
      php/include.php

+ 4 - 2
php/config.php

@@ -4,7 +4,7 @@
 	// START ERROR HANDLING
 	function shutdown_handler(){
 		$error = error_get_last();
-		if ($error['type'] == 1) {
+		if(!is_null($error)){
 			ob_end_clean();
 			switch($error['type']){
 				case E_USER_ERROR:$errnostr='Fatal Error';break;
@@ -29,7 +29,9 @@
 	}
 	register_shutdown_function('shutdown_handler');
 	// END ERROR HANDLING
-	@session_start();
+	if(session_status() == PHP_SESSION_NONE){
+		@session_start();
+	}
 	define('PATH_ROOT',realpath(dirname(__FILE__)).'/../');
 	define('PATH_CONFIG',PATH_ROOT.'config.json');
 	define('PATH_DEFAULT_CONFIG',PATH_ROOT.'config.default.json');

+ 3 - 1
php/include.php

@@ -4,7 +4,9 @@
 			'error'=>'Session save path ('.session_save_path().') is not writable.'
 		),'error');
 	}
-	@session_start();
+	if(session_status() == PHP_SESSION_NONE){
+		@session_start();
+	}
 	require_once(realpath(dirname(__FILE__)).'/config.php');
 	require_once(PATH_PHP.'database.php');
 	require_once(PATH_PHP.'functions.php');