aboutsummaryrefslogtreecommitdiffstats
path: root/mod/connedit.php
diff options
context:
space:
mode:
authorTony Baldwin <tonybaldwin@gmx.com>2014-03-09 19:22:54 -0400
committerTony Baldwin <tonybaldwin@gmx.com>2014-03-09 19:22:54 -0400
commit5cca00ddc79dad667464674e08a2a860e262eabd (patch)
tree53df980e32a6706e977a5a2276e0f9aa9ec09300 /mod/connedit.php
parent67166180bb560276273a20bcd9ca2a7aae036aba (diff)
parenta79072ce478a999b06df38ae324fbcef6d3a76e7 (diff)
downloadvolse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.gz
volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.bz2
volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: view/theme/redbasic/tpl/theme_settings.tpl reset to upstream
Diffstat (limited to 'mod/connedit.php')
-rw-r--r--mod/connedit.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/mod/connedit.php b/mod/connedit.php
index c6f64ccfc..b9b7fcce3 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -177,7 +177,13 @@ function connedit_content(&$a) {
$sort_type = 0;
$o = '';
+ // this triggers some javascript to set Full Sharing by default after
+ // completing a "follow" - which can be changed to something else before
+ // form submission, but this gives us something useable
+ if($_GET['follow'] == 1) {
+ $o .= '<script>var after_following = 1;</script>';
+ }
if(! local_user()) {
notice( t('Permission denied.') . EOL);
return login();