diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-08-15 10:47:34 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-08-15 10:47:34 +0200 |
| commit | f5f03d24e9ac04ac9f5ae5896ec04ccdc55ef38c (patch) | |
| tree | 5e76411ab737da52c20e094cdfbbeac813ec5389 /phpBB | |
| parent | da6be75a18896481caea7fda6582a9a6b9502e0a (diff) | |
| parent | 93a472f08e3d7f5f291ac3c5c8409fbf7f5e0705 (diff) | |
| download | forums-f5f03d24e9ac04ac9f5ae5896ec04ccdc55ef38c.tar forums-f5f03d24e9ac04ac9f5ae5896ec04ccdc55ef38c.tar.gz forums-f5f03d24e9ac04ac9f5ae5896ec04ccdc55ef38c.tar.bz2 forums-f5f03d24e9ac04ac9f5ae5896ec04ccdc55ef38c.tar.xz forums-f5f03d24e9ac04ac9f5ae5896ec04ccdc55ef38c.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 7 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 1bf5a3c6a8..5029510839 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -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 diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 8a2767e564..53c2c91008 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -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.', |