mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* 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
This commit is contained in:
Joas Schilling
2014-03-14 13:55:53 +01:00
parent 287c2b95ee 943e4e35ee
commit 7b08a483fd
4 changed files with 111 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/styles/prosilver/style.cfg
View File

@@ -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

2
phpBB/styles/subsilver2/style.cfg
View File

@@ -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