diff options
| -rw-r--r-- | apps/files_encryption/ajax/getMigrationStatus.php | 9 | ||||
| -rw-r--r-- | version.php | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/apps/files_encryption/ajax/getMigrationStatus.php b/apps/files_encryption/ajax/getMigrationStatus.php index 4da035a97d4..17469a1af0c 100644 --- a/apps/files_encryption/ajax/getMigrationStatus.php +++ b/apps/files_encryption/ajax/getMigrationStatus.php @@ -10,14 +10,15 @@ use OCA\Encryption\Util; \OCP\JSON::checkAppEnabled('files_encryption'); -$user = isset($_POST['user']) ? $_POST['user'] : ''; +$loginname = isset($_POST['user']) ? $_POST['user'] : ''; $password = isset($_POST['password']) ? $_POST['password'] : ''; $migrationCompleted = true; -if ($user !== '' && $password !== '') { - if (\OCP\User::checkPassword($user, $password)) { - $util = new Util(new \OC_FilesystemView('/'), $user); +if ($loginname !== '' && $password !== '') { + $username = \OCP\User::checkPassword($loginname, $password); + if ($username) { + $util = new Util(new \OC_FilesystemView('/'), $username); if ($util->getMigrationStatus() !== Util::MIGRATION_COMPLETED) { $migrationCompleted = false; } diff --git a/version.php b/version.php index 2e3b8f1f904..e694eb188bb 100644 --- a/version.php +++ b/version.php @@ -1,10 +1,10 @@ <?php // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel when updating major/minor version number. -$OC_Version=array(6, 00, 0, 8); +$OC_Version=array(6, 00, 0, 9); // The human readable string -$OC_VersionString='6.0 beta 5'; +$OC_VersionString='6.0 RC1'; // The ownCloud edition $OC_Edition=''; |