Merge pull request #26 from humhub/fix/25-double-qr-code-after-cancel…

…-new-request-code Fix double rendering QR code after cancel of requesting new code
humhub · May 19, 2021 · 412fac4 · 412fac4
2 parents 861230a + b65a657
commit 412fac4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -4,6 +4,7 @@ Changelog
 1.0.4 (Unreleased)
 --------------------
 - Fix #23: Urlencode account name in otpauth URL 
+- Fix #25: Fix double rendering QR code after cancel of requesting new code
 
 1.0.3 (May 11, 2021)
 --------------------

diff --git a/views/config/userGoogleAuthenticatorCode.php b/views/config/userGoogleAuthenticatorCode.php
@@ -43,12 +43,14 @@
 
 <script>
 $(document).ready(function(){
-    new QRCode('twofa-google-auth-qrcode', {
-        text: '<?= $qrCodeText ?>',
-        width: 300,
-        height: 300,
-        correctLevel: QRCode.CorrectLevel.L
-    });
+    if ($('#twofa-google-auth-qrcode').html() === '') {
+        new QRCode('twofa-google-auth-qrcode', {
+            text: '<?= $qrCodeText ?>',
+            width: 300,
+            height: 300,
+            correctLevel: QRCode.CorrectLevel.L
+        });
+    }
 <?php if ($requirePinCode) : ?>
     $('#twofaGoogleAuthPinCode').show();
     $('input[name="GoogleAuthenticatorUserSettings[changeSecretCode]"]').val(1);