mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-25 18:13:28 +01:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x

Browse Source
This commit is contained in:
Marc Alexander 2019-08-15 10:47:34 +02:00
commit f5f03d24e9
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/acp/acp_styles.php
View File

@ -1123,7 +1123,14 @@ class acp_styles
*/
protected function read_style_cfg($dir)
{
// This should never happen, we give them a red warning because of its relevance.
if (!file_exists($this->styles_path . $dir . '/style.cfg'))
{
trigger_error($this->user->lang('NO_STYLE_CFG', $dir), E_USER_WARNING);
}
static $required = array('name', 'phpbb_version', 'copyright');
$cfg = parse_cfg_file($this->styles_path . $dir . '/style.cfg');
// Check if it is a valid file

1
phpBB/language/en/common.php
View File

@ -530,6 +530,7 @@ $lang = array_merge($lang, array(
'NO_FEED_ENABLED' => 'Feeds are not available on this board.',
'NO_FEED' => 'The requested feed is not available.',
'NO_STYLE_DATA' => 'Could not get style data',
'NO_STYLE_CFG' => 'Could not get the style configuration file for: %s',
'NO_SUBJECT' => 'No subject specified', // Used for posts having no subject defined but displayed within management pages.
'NO_SUCH_SEARCH_MODULE' => 'The specified search backend doesn’t exist.',
'NO_SUPPORTED_AUTH_METHODS' => 'No supported authentication methods.',