Fix login before upgrade

midasplatform · Sep 14, 2015 · e339363 · e339363
1 parent 1871984
commit e339363
Showing 1 changed file with 7 additions and 1 deletion.
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.');