From f8468b4c3aeeb51f485c6bb7107f5b64a9643c85 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 29 Sep 2014 23:36:41 -0700
Subject: allow custom role permissions and fix site timezone.

---
 include/permissions.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'include/permissions.php')

diff --git a/include/permissions.php b/include/permissions.php
index 438b807d0..61ac8aea3 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -722,6 +722,11 @@ function get_role_perms($role) {
 	
 	}
 
+	$x = get_config('system','role_perms');
+	// let system settings over-ride any or all 
+	if($x && is_array($x) && array_key_exists($role,$x))
+		$ret = array_merge($ret,$x[$role]);
+
 	call_hooks('get_role_perms',$ret);
 
 	return $ret;
-- 
cgit v1.2.3