Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ and this project follows the
which is based on the major version of Backdrop CMS with a semantic version
system for each contributed module, theme and layout.

## [Unreleased] - 2025-04-30
## [Unreleased] - 2025-07-08

### Added
- An option for the `db-import` command to allow import from newer MariaDB
Expand All @@ -22,6 +22,7 @@ layout templates or Backdrop itself.
### Fixed
- Unhandled errors and warnings if commands run outside Backdrop root and/or
before installing Backdrop.
- Error if importing config to database config storage.

### Changed
- Bee will now notify the user of additional modules that will be enabled or disabled
Expand Down
26 changes: 24 additions & 2 deletions commands/config.bee.inc
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ function config_import_bee_callback($arguments, $options) {
backdrop_flush_all_caches();

bee_message(bt("Config was imported to '!active'.", array(
'!active' => config_get_config_directory('active'),
'!active' => config_bee_get_config_location('active'),
)), 'success');
bee_message(format_plural(count($rows),
'1 file was synced.',
Expand All @@ -338,6 +338,28 @@ function config_export_bee_callback($arguments, $options) {
}

bee_message(bt("Config was exported to '!staging'.", array(
'!staging' => config_get_config_directory('staging'),
'!staging' => config_bee_get_config_location('staging'),
)), 'success');
}

/**
* Helper function to get config storage location.
*
* @param string $type
* The type of config location: 'active' or 'staging'.
*
* @return string
* The selected storage location.
*/
function config_bee_get_config_location($type) {
$class = settings_get('config_' . $type . '_class', 'ConfigFileStorage');
switch ($class) {
case 'ConfigDatabaseStorage':
$config_location = 'db://default/config_' . $type;
break;
case 'ConfigFileStorage':
default:
$config_location = config_get_config_directory($type);
}
return $config_location;
}
Loading