diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-10 17:44:04 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-10 17:44:04 -0700 |
| commit | 9a5d9fb8c59b04ef64151d1d038dc2659898d295 (patch) | |
| tree | 1d29e19a3b1979d6c40a4fa46f51ba75428d2213 | |
| parent | edd2d1e8d47be1ef4fe38edf624335472a2e73bd (diff) | |
| download | volse-hubzilla-9a5d9fb8c59b04ef64151d1d038dc2659898d295.tar.gz volse-hubzilla-9a5d9fb8c59b04ef64151d1d038dc2659898d295.tar.bz2 volse-hubzilla-9a5d9fb8c59b04ef64151d1d038dc2659898d295.zip | |
put block_public back where it is needed, which is in mod_public and not mod_home
| -rw-r--r-- | mod/public.php | 6 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mod/public.php b/mod/public.php index 1f23a1999..64ae9d20a 100644 --- a/mod/public.php +++ b/mod/public.php @@ -7,6 +7,12 @@ function public_content(&$a, $update = 0, $load = false) { if($load) $_SESSION['loadtime'] = datetime_convert(); + + if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) { + return login(); + } + + if(get_config('system','disable_discover_tab')) return; diff --git a/version.inc b/version.inc index 154027d3a..273ae533b 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-06-09.1058 +2015-06-10.1059 |