From 205ce073b52905fa3558ff92fb89e5e5a7b682c0 Mon Sep 17 00:00:00 2001 From: Paul Arthur Date: Thu, 31 Jan 2013 15:32:54 -0500 Subject: Fix the session type exception for use_auth=false The table definition changed slightly and the old workaround didn't work. If auth is disabled, we really don't care that much, so just drop the attempt to constrain type in that case. --- lib/class/session.class.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'lib/class') diff --git a/lib/class/session.class.php b/lib/class/session.class.php index 68bc16e4..a4d3d576 100644 --- a/lib/class/session.class.php +++ b/lib/class/session.class.php @@ -272,14 +272,13 @@ class Session { } break; case 'interface': - // Build a list of enabled authentication types - $types = Config::get('auth_methods'); - if (!Config::get('use_auth')) { - $types[] = ''; + $sql = 'SELECT * FROM `session` WHERE `id` = ? AND `expire` > ?'; + if (Config::get('use_auth')) { + // Build a list of enabled authentication types + $types = Config::get('auth_methods'); + $enabled_types = implode("','", $types); + $sql .= " AND `type` IN('$enabled_types')"; } - $enabled_types = implode("','", $types); - $sql = 'SELECT * FROM `session` WHERE `id` = ? AND `expire` > ? ' . - "AND `type` IN('$enabled_types')"; $db_results = Dba::read($sql, array($key, time())); if (Dba::num_rows($db_results)) { -- cgit