diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-06 13:31:15 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-06 13:31:15 +0100 |
| commit | d0adbe94d53cd5997e8ab66ec3788240669826ff (patch) | |
| tree | deea9bc504c60a54245f1aa2adeb9715dbfd3d60 /phpBB | |
| parent | ea6bcdff52fb3f4dc916d39e427643bc00982352 (diff) | |
| parent | e75c04f02a951b3cdc0a754fee7e58d7a8d6a4a4 (diff) | |
| download | forums-d0adbe94d53cd5997e8ab66ec3788240669826ff.tar forums-d0adbe94d53cd5997e8ab66ec3788240669826ff.tar.gz forums-d0adbe94d53cd5997e8ab66ec3788240669826ff.tar.bz2 forums-d0adbe94d53cd5997e8ab66ec3788240669826ff.tar.xz forums-d0adbe94d53cd5997e8ab66ec3788240669826ff.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/includes/mcp/mcp_main.php
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 945e881deb..e2fb1e4afa 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -262,7 +262,7 @@ class mcp_main */ 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') { |