diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-14 13:55:53 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-14 13:55:53 +0100 |
| commit | 7b08a483fd364138a573bb5f403fb6176c2b5c04 (patch) | |
| tree | b3a5d9ea807d8944099de77f1584f74ff72008d4 /phpBB | |
| parent | 287c2b95ee64540374a78b6e4777d93c474dd402 (diff) | |
| parent | 943e4e35eef80b9ebe689e6b1933a405575962c3 (diff) | |
| download | forums-7b08a483fd364138a573bb5f403fb6176c2b5c04.tar forums-7b08a483fd364138a573bb5f403fb6176c2b5c04.tar.gz forums-7b08a483fd364138a573bb5f403fb6176c2b5c04.tar.bz2 forums-7b08a483fd364138a573bb5f403fb6176c2b5c04.tar.xz forums-7b08a483fd364138a573bb5f403fb6176c2b5c04.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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
Conflicts:
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 8 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/style.cfg | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/style.cfg | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 5e5f508b6b..ebd676b17a 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3123,7 +3123,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'))) @@ -3140,7 +3140,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 50755cdbe5..f4f67635dd 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -17,7 +17,7 @@ # General Information about this style name = prosilver -copyright = © phpBB Group, 2007 +copyright = © phpBB Group, 2007 style_version = 3.1.0-a3 phpbb_version = 3.1.0-a3 diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 19441b43ba..9ca6077dfa 100644 --- a/phpBB/styles/subsilver2/style.cfg +++ b/phpBB/styles/subsilver2/style.cfg @@ -17,7 +17,7 @@ # General Information about this style name = subsilver2 -copyright = © 2005 phpBB Group +copyright = © 2005 phpBB Group style_version = 3.1.0-a3 phpbb_version = 3.1.0-a3 |