aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-10-29 17:44:42 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-11-21 23:55:48 +0100
commit7f8c4d877a9d9d5837e1b3612b2678d024ca087b (patch)
treeedf97fb54ff0555e766427f59fe181c60e159320 /phpBB/includes
parent2e2ab7b485f76ab4000b5d8c47c846ff44c10a33 (diff)
downloadforums-7f8c4d877a9d9d5837e1b3612b2678d024ca087b.tar
forums-7f8c4d877a9d9d5837e1b3612b2678d024ca087b.tar.gz
forums-7f8c4d877a9d9d5837e1b3612b2678d024ca087b.tar.bz2
forums-7f8c4d877a9d9d5837e1b3612b2678d024ca087b.tar.xz
forums-7f8c4d877a9d9d5837e1b3612b2678d024ca087b.zip
[ticket/10744] Prevent installing styles with reserved names
PHPBB3-10744
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_styles.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index af3fd7937c..330da0ff73 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -29,6 +29,7 @@ class acp_styles
protected $styles_path;
protected $styles_path_absolute = 'styles';
protected $default_style = 0;
+ protected $reserved_style_names = array('adm', 'admin', 'all');
protected $db;
protected $user;
@@ -164,6 +165,12 @@ class acp_styles
$last_installed = false;
foreach ($dirs as $dir)
{
+ if (in_array($dir, $this->reserved_style_names))
+ {
+ $messages[] = $this->user->lang('STYLE_NAME_RESERVED', htmlspecialchars($dir));
+ continue;
+ }
+
$found = false;
foreach ($styles as &$style)
{