aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-10 17:58:02 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-10 17:58:02 -0700
commita14d2de1f0cb20f73d332f1df8c6437bbab5aec7 (patch)
tree3f9e4e6c77adc9865e13bda7bd1a6e3e6fb094ea
parentca870dbf31d31455ab4f5e0f461c5af89e1573fa (diff)
parent04551ac32b171ce49eac64cee0eca719d8e2f58a (diff)
downloadvolse-hubzilla-a14d2de1f0cb20f73d332f1df8c6437bbab5aec7.tar.gz
volse-hubzilla-a14d2de1f0cb20f73d332f1df8c6437bbab5aec7.tar.bz2
volse-hubzilla-a14d2de1f0cb20f73d332f1df8c6437bbab5aec7.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
-rw-r--r--mod/public.php6
-rw-r--r--version.inc2
2 files changed, 7 insertions, 1 deletions
diff --git a/mod/public.php b/mod/public.php
index 3868f6d6c..6a4e6a334 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