Merge remote-tracking branch 'upstream/develop' into aria

[friendica.git] / view / theme / frio / templates / msg-header.tpl

diff --git a/view/theme/frio/templates/msg-header.tpl b/view/theme/frio/templates/msg-header.tpl
index 97aa5a64fc9bf96df6ebf19a5a6769078deca502..a1290c6ca65514ed208f63674487128132f8c683 100644 (file)
--- a/view/theme/frio/templates/msg-header.tpl
+++ b/view/theme/frio/templates/msg-header.tpl
@@ -1,12 +1,15 @@
 
 <script type="text/javascript">
-       $("#comment-edit-text-input").editor_autocomplete(baseurl+"/acl");
+       $("#comment-edit-text-input").editor_autocomplete(baseurl + '/search/acl');
 
        $(document).ready(function() {
                $("#comment-edit-text-input").bbco_autocomplete('bbcode');
                $('#mail-conversation').perfectScrollbar();
                $('#message-preview').perfectScrollbar();
                // Scroll to the bottom of the mail conversation.
-               $('#mail-conversation').scrollTop($('#mail-conversation')[0].scrollHeight);
+               var $el = $('#mail-conversation');
+               if ($el.length) {
+                       $el.scrollTop($el.get(0).scrollHeight);
+               }
        });
 </script>