aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_profile.php
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2012-03-31 01:09:41 +0200
committerIgor Wiedler <igor@wiedler.ch>2012-03-31 02:10:17 +0200
commit8138103c6b5695b07c2f98d7ff9942e22903591a (patch)
treedfeb42c162cfd566c50b2a84d883615a0e2743fb /phpBB/includes/acp/acp_profile.php
parentac320fad0599184f458786455cc441010d6f6d35 (diff)
downloadforums-8138103c6b5695b07c2f98d7ff9942e22903591a.tar
forums-8138103c6b5695b07c2f98d7ff9942e22903591a.tar.gz
forums-8138103c6b5695b07c2f98d7ff9942e22903591a.tar.bz2
forums-8138103c6b5695b07c2f98d7ff9942e22903591a.tar.xz
forums-8138103c6b5695b07c2f98d7ff9942e22903591a.zip
[feature/ajax] Send correct activate/deactivate JSON response in acp_profile
PHPBB3-10270
Diffstat (limited to 'phpBB/includes/acp/acp_profile.php')
-rw-r--r--phpBB/includes/acp/acp_profile.php18
1 files changed, 18 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index 511148baf9..3ffffd3047 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -242,6 +242,15 @@ class acp_profile
$db->sql_freeresult($result);
add_log('admin', 'LOG_PROFILE_FIELD_ACTIVATE', $field_ident);
+
+ if ($request->is_ajax())
+ {
+ $json_response = new phpbb_json_response();
+ $json_response->send(array(
+ 'text' => $user->lang('DEACTIVATE'),
+ ));
+ }
+
trigger_error($user->lang['PROFILE_FIELD_ACTIVATED'] . adm_back_link($this->u_action));
break;
@@ -266,7 +275,16 @@ class acp_profile
$field_ident = (string) $db->sql_fetchfield('field_ident');
$db->sql_freeresult($result);
+ if ($request->is_ajax())
+ {
+ $json_response = new phpbb_json_response();
+ $json_response->send(array(
+ 'text' => $user->lang('ACTIVATE'),
+ ));
+ }
+
add_log('admin', 'LOG_PROFILE_FIELD_DEACTIVATE', $field_ident);
+
trigger_error($user->lang['PROFILE_FIELD_DEACTIVATED'] . adm_back_link($this->u_action));
break;