From 9a5d9fb8c59b04ef64151d1d038dc2659898d295 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 10 Jun 2015 17:44:04 -0700 Subject: put block_public back where it is needed, which is in mod_public and not mod_home --- mod/public.php | 6 ++++++ version.inc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3