From 200e115ee6f9e4827302cf6c4538c15b0955bf43 Mon Sep 17 00:00:00 2001
From: xisi <chaeldarrs@gmail.com>
Date: Mon, 20 Jan 2014 06:21:42 -0500
Subject: [PATCH] forgot to move this to the new config setting, oops

---
 public/include/pages/login.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/include/pages/login.inc.php b/public/include/pages/login.inc.php
index 09f5e1e8..13c8b504 100644
--- a/public/include/pages/login.inc.php
+++ b/public/include/pages/login.inc.php
@@ -41,7 +41,7 @@ if ($setting->getValue('maintenance') && !$user->isAdmin($user->getUserId($_POST
       $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to login: The captcha you entered was incorrect', 'TYPE' => 'errormsg');
     }
   }
-  if ($config['csrf']['enabled'] && $config['csrf']['forms']['login']) {
+  if ($config['csrf']['enabled'] && !in_array('login', $config['csrf']['disabled_forms'])) {
     if ((isset($_POST['ctoken']) && $_POST['ctoken'] !== $csrftoken->getBasic($user->getCurrentIP(), 'login')) || (!isset($_POST['ctoken']))) {
       // csrf protection is on and this token is invalid, error out -> time expired
       $nocsrf = 0;