diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-14 13:53:55 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-14 13:53:55 +0100 |
| commit | 943e4e35eef80b9ebe689e6b1933a405575962c3 (patch) | |
| tree | 99ae55450680609dc2ee4979f6f8020c13aeda02 /phpBB | |
| parent | 03eb23cbae5281a0e75274e52d54e2b9250de99a (diff) | |
| parent | a6b274e8aba3558065b290f243891e846cc726a3 (diff) | |
| download | forums-943e4e35eef80b9ebe689e6b1933a405575962c3.tar forums-943e4e35eef80b9ebe689e6b1933a405575962c3.tar.gz forums-943e4e35eef80b9ebe689e6b1933a405575962c3.tar.bz2 forums-943e4e35eef80b9ebe689e6b1933a405575962c3.tar.xz forums-943e4e35eef80b9ebe689e6b1933a405575962c3.zip | |
Merge remote-tracking branch 'exreaction/ticket/12202' into develop-olympus
* exreaction/ticket/12202:
[ticket/12202] Use an array in the data provider instead of exploding manually
[ticket/12202] Can't call htmlspecialchars before checking for quotes
[ticket/12202] Fix tests
[ticket/12202] Test for parse_cfg_file
[ticket/12202] Use copyright symbol in style.cfg files
[ticket/12202] Apply htmlspecialchars to style.cfg data
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 8 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/style.cfg | 4 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/style.cfg | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index eef4ade4e7..f0657b9016 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3367,7 +3367,7 @@ function parse_cfg_file($filename, $lines = false) } // Determine first occurrence, since in values the equal sign is allowed - $key = strtolower(trim(substr($line, 0, $delim_pos))); + $key = htmlspecialchars(strtolower(trim(substr($line, 0, $delim_pos)))); $value = trim(substr($line, $delim_pos + 1)); if (in_array($value, array('off', 'false', '0'))) @@ -3384,7 +3384,11 @@ function parse_cfg_file($filename, $lines = false) } else if (($value[0] == "'" && $value[sizeof($value) - 1] == "'") || ($value[0] == '"' && $value[sizeof($value) - 1] == '"')) { - $value = substr($value, 1, sizeof($value)-2); + $value = htmlspecialchars(substr($value, 1, sizeof($value)-2)); + } + else + { + $value = htmlspecialchars($value); } $parsed_items[$key] = $value; diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 811e5f4376..abd5a5dd22 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -18,5 +18,5 @@ # General Information about this style name = prosilver -copyright = © phpBB Group, 2007 -version = 3.0.12
\ No newline at end of file +copyright = © phpBB Group, 2007 +version = 3.0.12 diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index b99c433ff1..b0fe5e6639 100644 --- a/phpBB/styles/subsilver2/style.cfg +++ b/phpBB/styles/subsilver2/style.cfg @@ -18,5 +18,5 @@ # General Information about this style name = subsilver2 -copyright = © 2005 phpBB Group +copyright = © 2005 phpBB Group version = 3.0.12 |