1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-22 00:21:02 +01:00

Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Marc Alexander 2017-05-02 13:16:36 -04:00
commit 877760ef98
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

@ -216,6 +216,15 @@ class acp_extensions
meta_refresh(0, $this->u_action . '&action=enable&ext_name=' . urlencode($ext_name) . '&hash=' . generate_link_hash('enable.' . $ext_name));
}
}
// Update custom style for admin area
$this->template->set_custom_style(array(
array(
'name' => 'adm',
'ext_path' => 'adm/style/',
),
), array($phpbb_root_path . 'adm/style'));
$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_EXT_ENABLE', time(), array($ext_name));
}
catch (\phpbb\db\migration\exception $e)