mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/11158] Require acl_u_sig for ucp signature module.
  [ticket/11158] Revert old fix in PHPBB3-10186.

Conflicts:
	phpBB/install/database_update.php
	phpBB/ucp.php
This commit is contained in:
Andreas Fischer
2012-10-29 15:16:59 -04:00
parent dc8052b5c0 88b100d818
commit c9ad0c6f25
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/ucp.php
View File

@@ -322,12 +322,6 @@ if (!$config['allow_topic_notify'] && !$config['allow_forum_notify'])
$module->set_display('main', 'subscribed', false);
}
// Do not display signature panel if not authed to do so
if (!$auth->acl_get('u_sig'))
{
$module->set_display('profile', 'signature', false);
}
/**
* Use this event to enable and disable additional UCP modules
*