BUG: refs #952. Had mistakenly removed needed convertLegacy in previous commit.

Michael Grauer · Michael Grauer · commit ba276b59de6f · 2013-03-13T18:17:18.000-04:00
diff --git a/core/controllers/UserController.php b/core/controllers/UserController.php
@@ -491,6 +491,10 @@ function loginAction()
               return;
               }
             }
+          if(version_compare($currentVersion, '3.2.12', '>=') && $userDao->getSalt() == '')
+            {
+            $passwordHash = $this->User->convertLegacyPasswordHash($userDao, $form->getValue('password'));
+            }
           $remember = $form->getValue('remerberMe');
           if(isset($remember) && $remember == 1)
             {

Original file line number	Diff line number	Diff line change
`@@ -491,6 +491,10 @@ function loginAction()`
`491`	`491`	`return;`
`492`	`492`	`}`
`493`	`493`	`}`
	`494`	`+ if(version_compare($currentVersion, '3.2.12', '>=') && $userDao->getSalt() == '')`
	`495`	`+ {`
	`496`	`+ $passwordHash = $this->User->convertLegacyPasswordHash($userDao, $form->getValue('password'));`
	`497`	`+ }`
`494`	`498`	`$remember = $form->getValue('remerberMe');`
`495`	`499`	`if(isset($remember) && $remember == 1)`
`496`	`500`	`{`