From 7e5d0b9ec8568ea12bb2d8ef7fc7501ed17dce99 Mon Sep 17 00:00:00 2001 From: 3D-I <480857+3D-I@users.noreply.github.com> Date: Wed, 1 Jan 2020 00:33:59 +0100 Subject: [ticket/16281] Fix Ajax refresh-data for extensions' Tab PHPBB3-16281 --- phpBB/adm/style/acp_ext_actions.html | 7 ++++--- phpBB/includes/acp/acp_extensions.php | 27 ++++++++++++--------------- 2 files changed, 16 insertions(+), 18 deletions(-) (limited to 'phpBB') diff --git a/phpBB/adm/style/acp_ext_actions.html b/phpBB/adm/style/acp_ext_actions.html index 6f2341f381..6b59ab7180 100644 --- a/phpBB/adm/style/acp_ext_actions.html +++ b/phpBB/adm/style/acp_ext_actions.html @@ -1,6 +1,7 @@ {% for action in enabled.actions %} -{{ action.L_ACTION }}{% if not action.S_LAST_ROW %} | {% endif %} + {{ action.L_ACTION }}{% if not action.S_LAST_ROW %} | {% endif %} {% endfor %} + {% for action in disabled.actions %} -{{ action.L_ACTION }}{% if not action.S_LAST_ROW %} | {% endif %} -{% endfor %} \ No newline at end of file + {{ action.L_ACTION }}{% if not action.S_LAST_ROW %} | {% endif %} +{% endfor %} diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index b02d9710c0..86966541be 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -246,11 +246,10 @@ class acp_extensions $data = [ 'EXT_ENABLE_SUCCESS' => true, 'ACTIONS' => $actions, - ]; - - $data['REFRESH_DATA'] = [ - 'url' => '', - 'time' => 0, + 'REFRESH_DATA' => [ + 'url' => '', + 'time' => 0, + ], ]; $json_response = new \phpbb\json_response; @@ -310,11 +309,10 @@ class acp_extensions $data = [ 'EXT_DISABLE_SUCCESS' => true, 'ACTIONS' => $actions, - ]; - - $data['REFRESH_DATA'] = [ - 'url' => '', - 'time' => 0, + 'REFRESH_DATA' => [ + 'url' => '', + 'time' => 0, + ], ]; $json_response = new \phpbb\json_response; @@ -380,11 +378,10 @@ class acp_extensions $data = [ 'EXT_DELETE_DATA_SUCCESS' => true, 'ACTIONS' => $actions, - ]; - - $data['REFRESH_DATA'] = [ - 'url' => '', - 'time' => 0, + 'REFRESH_DATA' => [ + 'url' => '', + 'time' => 0, + ], ]; $json_response = new \phpbb\json_response; -- cgit v1.2.1