X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_person.php;fp=DataObjects%2FCore_person.php;h=56c08afc2d90570feadfd1ec8c1d4dfeadec0e7a;hp=8799d542223c252e399b80dcc078b16e2f9759d7;hb=cbab89641fa1f2d533c70e6a5983e488568880e4;hpb=90d4031765e4ad31a05a3a23cfbc81416ecadac6

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 8799d542..56c08afc 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -257,7 +257,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         // we have a situation where the app is behind a http access and is also login
         // need to work out a way to handle that.
  
-        if (php_sapi_name() != "cli" && empty($_SERVER['PHP_AUTH_USER']) && !empty($ff->disable_http_auth))  {
+        if (php_sapi_name() != "cli" && (empty($_SERVER['PHP_AUTH_USER']) || !empty($ff->disable_http_auth)))  {
              @session_start();
         }
         
@@ -290,7 +290,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         // http basic auth..
         $u = DB_DataObject::factory($this->tableName());
         
-        if (empty($_COOKIE['PHPSESSID']) // http auth requests should not have this...
+        if (empty($ff->disable_http_auth)  // http auth requests should not have this...
             &&
             !empty($_SERVER['PHP_AUTH_USER']) 
             &&