diff options
| author | friendica <info@friendica.com> | 2014-06-14 15:13:53 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-06-14 15:13:53 -0700 |
| commit | 794cded66e521cdc581e00e4c432694c3117cfed (patch) | |
| tree | 5b0e95e8b7acd2c76e6f3d5b88962230fd7c0bc2 /mod | |
| parent | ca78adb0c04dce985dd6752f03acce75811167dc (diff) | |
| parent | c97aa4504e71140a342cc48b1d7ff81842cb108b (diff) | |
| download | volse-hubzilla-794cded66e521cdc581e00e4c432694c3117cfed.tar.gz volse-hubzilla-794cded66e521cdc581e00e4c432694c3117cfed.tar.bz2 volse-hubzilla-794cded66e521cdc581e00e4c432694c3117cfed.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/connections.php | 1 | ||||
| -rw-r--r-- | mod/editwebpage.php | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/mod/connections.php b/mod/connections.php index 3c3a704b2..b9df3c2b7 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -233,6 +233,7 @@ function connections_content(&$a) { $a->argc = 1; unset($a->argv[1]); } + nav_set_selected('intros'); break; case 'unconnected': $search_flags = ABOOK_FLAG_UNCONNECTED; diff --git a/mod/editwebpage.php b/mod/editwebpage.php index 38aef4a8b..deaf9ae57 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -169,7 +169,6 @@ function editwebpage_content(&$a) { '$placeholdercategory' => t('Categories (comma-separated list)'), '$emtitle' => t('Example: bob@example.com, mary@example.com'), 'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'), - '$acl' => populate_acl($itm[0]), '$bang' => '', '$profile_uid' => (intval($owner)), '$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''), |