diff options
| author | friendica <info@friendica.com> | 2014-10-23 22:00:16 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-10-23 22:00:16 -0700 |
| commit | 1a9b8d4f0c89436d26f3e2e4aafb81c2e62fc8c2 (patch) | |
| tree | f10cbcf6bb64fb217071bcc4051772330ba6119e | |
| parent | 34781433c1fabd7a4992497da5ee475db0ada3a8 (diff) | |
| download | volse-hubzilla-1a9b8d4f0c89436d26f3e2e4aafb81c2e62fc8c2.tar.gz volse-hubzilla-1a9b8d4f0c89436d26f3e2e4aafb81c2e62fc8c2.tar.bz2 volse-hubzilla-1a9b8d4f0c89436d26f3e2e4aafb81c2e62fc8c2.zip | |
don't offer forum (@name+) completion in comments, since it won't do anything.
| -rw-r--r-- | mod/acl.php | 4 | ||||
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rwxr-xr-x | view/tpl/display-head.tpl | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mod/acl.php b/mod/acl.php index 5658a05c5..7eb180cc4 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -11,7 +11,7 @@ function acl_init(&$a){ $count = (x($_REQUEST,'count')?$_REQUEST['count']:100); $search = (x($_REQUEST,'search')?$_REQUEST['search']:""); $type = (x($_REQUEST,'type')?$_REQUEST['type']:""); - + $noforums = (x($_REQUEST,'n') ? $_REQUEST['n'] : false); // For use with jquery.autocomplete for private mail completion @@ -230,7 +230,7 @@ function acl_init(&$a){ if(strpos($g['hash'],'/')) continue; - if(($g['abook_their_perms'] & PERMS_W_TAGWALL) && $type == 'c') { + if(($g['abook_their_perms'] & PERMS_W_TAGWALL) && $type == 'c' && (! $noforums)) { $contacts[] = array( "type" => "c", "photo" => "images/twopeople.png", diff --git a/view/js/main.js b/view/js/main.js index 32db7ccb7..beedb7f01 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -575,7 +575,7 @@ function updateConvItems(mode,data) { } /* autocomplete @nicknames */ - $(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl"); + $(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl?f=&n=1"); var bimgs = $(".wall-item-body img").not(function() { return this.complete; }); var bimgcount = bimgs.length; diff --git a/view/tpl/display-head.tpl b/view/tpl/display-head.tpl index 3d4e7e96a..007d33fe8 100755 --- a/view/tpl/display-head.tpl +++ b/view/tpl/display-head.tpl @@ -1,8 +1,8 @@ <script> $(document).ready(function() { - $(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); + $(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl?f=&n=1"); // make auto-complete work in more places - $(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl"); + $(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl?f=&n=1"); }); </script> |