diff --git a/library/includes/init_bb.php b/library/includes/init_bb.php index 11fab663f..622e696cf 100644 --- a/library/includes/init_bb.php +++ b/library/includes/init_bb.php @@ -375,6 +375,7 @@ function make_url(string $path = ''): string require_once INC_DIR . '/functions.php'; // Merge database configuration with base configuration using singleton +// bb_cfg deprecated, but kept for compatibility with non-adapted code config()->merge(bb_get_config(BB_CONFIG)); $bb_cfg = config()->all(); diff --git a/src/Legacy/Admin/Cron.php b/src/Legacy/Admin/Cron.php index 451152160..7da89ac8a 100644 --- a/src/Legacy/Admin/Cron.php +++ b/src/Legacy/Admin/Cron.php @@ -23,6 +23,7 @@ class Cron public static function run_jobs(string $jobs): void { /** @noinspection PhpUnusedLocalVariableInspection */ + // bb_cfg deprecated, but kept for compatibility with non-adapted cron jobs global $bb_cfg, $datastore; \define('IN_CRON', true); diff --git a/src/Legacy/Template.php b/src/Legacy/Template.php index ffed992c6..fa1139415 100644 --- a/src/Legacy/Template.php +++ b/src/Legacy/Template.php @@ -17,7 +17,7 @@ class Template { /** * Variable that holds all the data we'll be substituting into the compiled templates. - * This will end up being a multi-dimensional array like this: + * This will end up being a multidimensional array like this: * $this->_tpldata[block.][iteration#][child.][iteration#][child2.][iteration#][variablename] == value * if it's a root-level variable, it'll be like this: * $this->vars[varname] == value or $this->_tpldata['.'][0][varname] == value @@ -228,6 +228,7 @@ class Template { $this->cur_tpl = $filename; + /** @noinspection PhpUnusedLocalVariableInspection */ // bb_cfg deprecated, but kept for compatibility with non-adapted themes global $lang, $source_lang, $bb_cfg, $user;