diff options
author | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
---|---|---|
committer | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
commit | ac27db22c18ee7a82a52cbadb3efe2760b910499 (patch) | |
tree | aa7002d73dbcd4136033589f1cb135184f4126c1 /view/tpl/acl_selector.tpl | |
parent | 1a5a5c7edb8697c93f8bababbafa80245378dd7e (diff) | |
parent | 109cb936632c693d3f24afb9e2ce533797ad1a7f (diff) | |
download | volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.gz volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.bz2 volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
boot.php
include/dba/dba_driver.php
include/diaspora.php
include/follow.php
include/session.php
include/zot.php
mod/photos.php
mod/ping.php
Diffstat (limited to 'view/tpl/acl_selector.tpl')
-rwxr-xr-x | view/tpl/acl_selector.tpl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 4babf5669..e8b779622 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -31,14 +31,14 @@ </div><!-- /.modal --> <script> -$(document).ready(function() { - setTimeout( function () { +//$(document).ready(function() { +// setTimeout( function () { if(typeof acl=="undefined"){ acl = new ACL( baseurl+"/acl", [ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ] ); } - }, 5000 ); -}); +// }, 5000 ); +//}); </script> |