Commit a6395f17 authored by sylus's avatar sylus Committed by joseph.olstad

Issue #2856433 by natew, joseph.olstad, sylus: Update 7205 doesn't check if...

Issue #2856433 by natew, joseph.olstad, sylus: Update 7205 doesn't check if file view modes are enabled before migrating the configuration
parent 0d1c8588
......@@ -178,9 +178,9 @@ function media_wysiwyg_update_7205() {
// Migrate the configuration from the old variables into the new DB tables.
$types = file_type_load_all(TRUE);
foreach ($types as $type) {
$enabled = variable_get('media_wysiwyg_view_mode_audio_wysiwyg_restricted_view_modes_status', FALSE);
$enabled = variable_get("media_wysiwyg_view_mode_" . $type->type . "_wysiwyg_restricted_view_modes_status", FALSE);
if ($enabled) {
$wysiwyg_restricted_view_modes = variable_get("media_wysiwyg_view_mode_{$type->type}_wysiwyg_restricted_view_modes", array());
$wysiwyg_restricted_view_modes = variable_get("media_wysiwyg_view_mode_" . $type->type . "_wysiwyg_restricted_view_modes", array());
foreach ($wysiwyg_restricted_view_modes as $wysiwyg_restricted_view_mode) {
db_insert('media_restrict_wysiwyg')
->fields(array(
......@@ -191,9 +191,9 @@ function media_wysiwyg_update_7205() {
}
}
$enabled = variable_get('media_wysiwyg_view_mode_audio_file_wysiwyg_view_mode_status');
$enabled = variable_get("media_wysiwyg_view_mode_" . $type->type . "_wysiwyg_view_mode_status");
if ($enabled) {
$file_wysiwyg_view_mode = variable_get("media_wysiwyg_view_mode_{$type->type}_file_wysiwyg_view_mode", 'wysiwyg');
$file_wysiwyg_view_mode = variable_get("media_wysiwyg_view_mode_" . $type->type . "_file_wysiwyg_view_mode", 'wysiwyg');
db_insert('media_view_mode_wysiwyg')
->fields(array(
'type' => $type->type,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment