makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
Conflicts:
	phpBB/includes/mcp/mcp_main.php
This commit is contained in:
Marc Alexander 2016-01-06 13:31:15 +01:00
commit d0adbe94d5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/mcp/mcp_main.php
View file

@ -262,7 +262,7 @@ class mcp_main
*/ */
function lock_unlock($action, $ids) function lock_unlock($action, $ids)
{ {
global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_log; global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_log, $phpbb_dispatcher;
if ($action == 'lock' || $action == 'unlock') if ($action == 'lock' || $action == 'unlock')
{ {