Ensure sessions are enabled

Disable the initialization routine if sessions are disabled. Fixes #79
ericmann · Feb 16, 2019 · b969bc0 · b969bc0
1 parent ee85c61
commit b969bc0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -72,6 +72,7 @@ Changelog
 
 **4.1.1**
 - Fix: Defensively protect deprecated functions with `function_exists()` checks to avoid conflicts with other systems.
+- Fix: Disable the initialization routine if sessions are disabled.
 
 **4.1.0**
 - Fix: Add some defense to ensure end users are running the correct version of PHP before loading the system.

diff --git a/readme.txt b/readme.txt
@@ -76,6 +76,7 @@ None
 
 = 4.1.1 =
 * Fix: Defensively protect deprecated functions with `function_exists()` checks to avoid conflicts with other systems.
+- Fix: Disable the initialization routine if sessions are disabled.
 
 = 4.1.0 =
 * Fix: Add some defense to ensure end users are running the correct version of PHP before loading the system.

diff --git a/wp-session-manager.php b/wp-session-manager.php
@@ -144,10 +144,9 @@ function wp_session_manager_start_session()
 if (version_compare(PHP_VERSION, WP_SESSION_MINIMUM_PHP_VERSION, '<')) {
     add_action('admin_notices', 'wp_session_manager_deactivated_notice');
 } else {
-    add_action('plugins_loaded', 'wp_session_manager_initialize', 1, 0);
-
     // Start up session management, if we're not in the CLI.
-    if (!defined('WP_CLI') || false === WP_CLI) {
+    if (session_status() !== PHP_SESSION_DISABLED && (!defined('WP_CLI') || false === WP_CLI)) {
+        add_action('plugins_loaded', 'wp_session_manager_initialize',    1,  0);
         add_action('plugins_loaded', 'wp_session_manager_start_session', 10, 0);
     }
 }