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

[feature/ajax] Handle acp_modules error cases with JSON response

Browse source 
PHPBB3-10270
This commit is contained in:
Igor Wiedler 2012-02-15 22:45:04 +01:00
parent 2f44850a28
commit e73426fe26
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/acp/acp_modules.php
View file

@ -36,7 +36,7 @@ class acp_modules
function main($id, $mode) function main($id, $mode)
{ {
global $db, $user, $auth, $template, $module; global $db, $user, $auth, $template, $module, $request;
global $config, $phpbb_admin_path, $phpbb_root_path, $phpEx; global $config, $phpbb_admin_path, $phpbb_root_path, $phpEx;
// Set a global define for modules we might include (the author is able to prevent execution of code by checking this constant) // Set a global define for modules we might include (the author is able to prevent execution of code by checking this constant)
@ -373,6 +373,14 @@ class acp_modules
// Default management page // Default management page
if (sizeof($errors)) if (sizeof($errors))
{ {
if ($request->is_ajax())
{
phpbb_json_response::send(array(
'MESSAGE_TITLE' => $user->lang('ERROR'),
'MESSAGE_TEXT' => implode('<br />', $errors),
));
}
$template->assign_vars(array( $template->assign_vars(array(
'S_ERROR' => true, 'S_ERROR' => true,
'ERROR_MSG' => implode('<br />', $errors)) 'ERROR_MSG' => implode('<br />', $errors))