Merge branch 'master' of https://github.com/redmatrix/redmatrix

2015-06-10 17:58:02 -07:00 · 2015-06-10 17:58:02 -07:00 · a14d2de1f0
commit a14d2de1f0
parent ca870dbf31 04551ac32b
2 changed files with 7 additions and 1 deletions
--- 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;

--- a/version.inc
+++ b/version.inc
@ -1 +1 @@
-2015-06-09.1058
+2015-06-10.1059