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

[ticket/16019] Move code to before of confirm box is submitted

Browse source 
PHPBB3-16019
This commit is contained in:
3D-I 2019-08-13 04:59:29 +02:00
parent 3fbdb2f345
commit af84fb71e0
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
phpBB/includes/acp/acp_styles.php
View file

@ -259,6 +259,19 @@ class acp_styles
// Get list of styles to uninstall // Get list of styles to uninstall
$ids = $this->request_vars('id', 0, true); $ids = $this->request_vars('id', 0, true);
// Don't remove prosilver, you can still deactivate it.
$sql = 'SELECT style_id
FROM ' . STYLES_TABLE . "
WHERE style_name = '" . $this->db->sql_escape('prosilver') . "'";
$result = $this->db->sql_query($sql);
$prosilver_id = (int) $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result);
if (in_array($prosilver_id, $ids))
{
trigger_error($this->user->lang['UNINSTALL_PROSILVER'] . adm_back_link($this->u_action), E_USER_WARNING);
}
// Check if confirmation box was submitted // Check if confirmation box was submitted
if (confirm_box(true)) if (confirm_box(true))
{ {
@ -289,14 +302,6 @@ class acp_styles
{ {
global $user, $phpbb_log; global $user, $phpbb_log;
// Don't remove prosilver, you can still deactivate it.
$sql = 'SELECT style_id
FROM ' . STYLES_TABLE . "
WHERE style_name = '" . $this->db->sql_escape('prosilver') . "'";
$result = $this->db->sql_query($sql);
$prosilver_id = (int) $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result);
$default = $this->default_style; $default = $this->default_style;
$uninstalled = array(); $uninstalled = array();
$messages = array(); $messages = array();
@ -304,10 +309,6 @@ class acp_styles
// Check styles list // Check styles list
foreach ($ids as $id) foreach ($ids as $id)
{ {
if ($id == $prosilver_id)
{
trigger_error($this->user->lang['UNINSTALL_PROSILVER'] . adm_back_link($this->u_action), E_USER_WARNING);
}
if (!$id) if (!$id)
{ {
trigger_error($this->user->lang['INVALID_STYLE_ID'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($this->user->lang['INVALID_STYLE_ID'] . adm_back_link($this->u_action), E_USER_WARNING);