Merge branch 'release-2.3'

themes/bootstrap3/js/lightbox.js

@@ -193,6 +193,11 @@ var Lightbox = {
     if (typeof Recaptcha !== "undefined" && Recaptcha.widget) {
       Recaptcha.reload();
     }
+    // If the lightbox isn't visible, fix that
+    if(this.shown == false) {
+      $('#modal').modal('show');
+      this.shown = true;
+    }
   },
 
   /***********************************/

themes/bootstrap3/js/record.js

@@ -114,28 +114,12 @@ function registerAjaxCommentRecord() {
         if (response.status == 'OK') {
           refreshCommentList(id, recordSource);
           $(form).find('textarea[name="comment"]').val('');
-        } else if (response.status == 'NEED_AUTH') {
-          Lightbox.addCloseAction(function() {
-            $.ajax({
-              type: 'POST',
-              url:  url,
-              data: data,
-              dataType: 'json',
-              success:function() {
-                refreshCommentList(id, recordSource);
-                $(form).find('textarea[name="comment"]').val('');
-              }
-            });
-          });
-          return Lightbox.get('Record', 'AddComment', data, data);
+          $(form).find('input[type="submit"]').button('loading');
         } else {
-          $('#modal').find('.modal-body').html(response.data+'!');
-          $('#modal').find('.modal-header h3').html('Error!');
-          $('#modal').modal('show');
+          Lightbox.displayError(response.data);
         }
       }
     });
-    $(form).find('input[type="submit"]').button('loading');
     return false;
   });
   // Delete links

themes/bootstrap3/templates/RecordTab/usercomments.phtml

@@ -13,7 +13,13 @@
     <strong><?=$this->transEsc("Your Comment")?></strong>
   </div>
   <div class="col-sm-9">
-    <textarea id="comment" name="comment" class="form-control" rows="3" required></textarea><br/>
-    <input class="btn btn-primary" data-loading-text="<?=$this->transEsc('Submitting') ?>..." type="submit" value="<?=$this->transEsc("Add your comment")?>"/>
+    <? $user = $this->auth()->isLoggedIn() ?>
+    <? if($user): ?>
+      <textarea id="comment" name="comment" class="form-control" rows="3" required></textarea><br/>
+      <input class="btn btn-primary" data-loading-text="<?=$this->transEsc('Submitting') ?>..." type="submit" value="<?=$this->transEsc("Add your comment")?>"/>
+    <? else: ?>
+      <textarea id="comment" name="comment" class="form-control" rows="3" disabled></textarea><br/>
+      <input class="btn btn-primary" type="submit" value="<?=$this->transEsc("You must be logged in first")?>" disabled/>
+    <? endif; ?>
   </div>
 </form>