diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-02-05 18:05:59 +0100 | 
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-02-05 18:05:59 +0100 | 
| commit | 4eb72a4e7b6b3437f82fe4995b64ded6d0fdecef (patch) | |
| tree | dfb7411e230c746b9e9c48ded02a7d181cc83ab6 /phpBB | |
| parent | c45323863b649489a8c93a176ca556f8e4cf8e26 (diff) | |
| parent | c3896c8b5d56375df91f9357bc6f8eb22bfbebbb (diff) | |
| download | forums-4eb72a4e7b6b3437f82fe4995b64ded6d0fdecef.tar forums-4eb72a4e7b6b3437f82fe4995b64ded6d0fdecef.tar.gz forums-4eb72a4e7b6b3437f82fe4995b64ded6d0fdecef.tar.bz2 forums-4eb72a4e7b6b3437f82fe4995b64ded6d0fdecef.tar.xz forums-4eb72a4e7b6b3437f82fe4995b64ded6d0fdecef.zip  | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/13601] Add core.acl_clear_prefetch_after event
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/auth/auth.php | 12 | 
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/phpbb/auth/auth.php b/phpBB/phpbb/auth/auth.php index fc7cc1a0b1..dbd83f1eb0 100644 --- a/phpBB/phpbb/auth/auth.php +++ b/phpBB/phpbb/auth/auth.php @@ -514,7 +514,7 @@ class auth  	*/  	function acl_clear_prefetch($user_id = false)  	{ -		global $db, $cache; +		global $db, $cache, $phpbb_dispatcher;  		// Rebuild options cache  		$cache->destroy('_role_cache'); @@ -553,6 +553,16 @@ class auth  			$where_sql";  		$db->sql_query($sql); +		/** +		* Event is triggered after user(s) permission settings cache has been cleared +		* +		* @event core.acl_clear_prefetch_after +		* @var	mixed	user_id	User ID(s) +		* @since 3.1.11-RC1 +		*/ +		$vars = array('user_id'); +		extract($phpbb_dispatcher->trigger_event('core.acl_clear_prefetch_after', compact($vars))); +  		return;  	}  | 
