Don't start a session on CLI.
authorJan Schneider <jan@horde.org>
Thu, 19 Nov 2009 23:28:45 +0000 (00:28 +0100)
committerJan Schneider <jan@horde.org>
Thu, 19 Nov 2009 23:35:03 +0000 (00:35 +0100)
framework/Core/lib/Horde/Registry.php

index 007105f..c762a78 100644 (file)
@@ -139,7 +139,10 @@ class Horde_Registry
         }
 
         /* Start a session. */
-        if ($session_flags & self::SESSION_NONE) {
+        if ($session_flags & self::SESSION_NONE ||
+            (PHP_SAPI == 'cli') ||
+            (((PHP_SAPI == 'cgi') || (PHP_SAPI == 'cgi-fcgi')) &&
+             empty($_SERVER['SERVER_NAME']))) {
             /* Never start a session if the session flags include
                SESSION_NONE. */
             $_SESSION = array();