Fix login before upgrade

Jamie Snape · Jamie Snape · commit e339363be403 · 2015-09-14T10:00:41.000-04:00
diff --git a/core/controllers/UserController.php b/core/controllers/UserController.php
@@ -560,7 +560,13 @@ public function loginAction()
                     }
                 }
 
-                $instanceSalt = Zend_Registry::get('configGlobal')->get('password_prefix');
+                $instanceSalt = Zend_Registry::get('configGlobal')->get('password_prefix', false);
+
+                // Necessary for upgrades to 3.4.1.
+                if ($instanceSalt === false) {
+                    $instanceSalt = Zend_Registry::get('configGlobal')->password->prefix;
+                }
+
                 $currentVersion = UtilityComponent::getCurrentModuleVersion('core');
                 if ($currentVersion === false) {
                     throw new Zend_Exception('Core version is undefined.');

Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,13 @@ public function loginAction()`
`560`	`560`	`}`
`561`	`561`	`}`
`562`	`562`
`563`		`- $instanceSalt = Zend_Registry::get('configGlobal')->get('password_prefix');`
	`563`	`+ $instanceSalt = Zend_Registry::get('configGlobal')->get('password_prefix', false);`
	`564`	`+`
	`565`	`+ // Necessary for upgrades to 3.4.1.`
	`566`	`+ if ($instanceSalt === false) {`
	`567`	`+ $instanceSalt = Zend_Registry::get('configGlobal')->password->prefix;`
	`568`	`+ }`
	`569`	`+`
`564`	`570`	`$currentVersion = UtilityComponent::getCurrentModuleVersion('core');`
`565`	`571`	`if ($currentVersion === false) {`
`566`	`572`	`throw new Zend_Exception('Core version is undefined.');`