diff -u b/core/modules/breakpoint/breakpoint.module b/core/modules/breakpoint/breakpoint.module --- b/core/modules/breakpoint/breakpoint.module +++ b/core/modules/breakpoint/breakpoint.module @@ -140,42 +140,22 @@ function _breakpoint_import_breakpoints($label, $id, $source_type, $media_queries) { if (!empty($media_queries)) { $weight = 0; - // Use the existing breakpoint group if it exists. - $breakpoint_group = entity_load('breakpoint_group', $source_type . '.' . $id); - if (!$breakpoint_group) { - // Build a new breakpoint group. - $breakpoint_group = new BreakpointGroup(); - $breakpoint_group->id = $id; - $breakpoint_group->label = $label; - $breakpoint_group->source = $id; - $breakpoint_group->sourceType = $source_type; - } - else { - // Reset label. - $breakpoint_group->label = $label; - } + // Build a breakpoint group. + $breakpoint_group = new BreakpointGroup(); + $breakpoint_group->id = $id; + $breakpoint_group->label = $label; + $breakpoint_group->source = $id; + $breakpoint_group->sourceType = $source_type; foreach ($media_queries as $name => $media_query) { - // Use the existing breakpoint if it exists. - $breakpoint = entity_load('breakpoint', $source_type . '.' . $id . '.' . $name); - if (!$breakpoint) { - // Build a new breakpoint. - $breakpoint = new Breakpoint; - $breakpoint->name = $name; - $breakpoint->label = drupal_ucfirst($name); - $breakpoint->mediaQuery = $media_query; - $breakpoint->source = $id; - $breakpoint->sourceType = $source_type; - $breakpoint->status = TRUE; - $breakpoint->weight = $weight++; - $breakpoint->save(); - } - else { - // Reset name, label, weight and media query. - $breakpoint->name = $name; - $breakpoint->label = drupal_ucfirst($name); - $breakpoint->mediaQuery = $media_query; - $breakpoint->weight = $weight++; - } + $breakpoint = new Breakpoint; + $breakpoint->name = $name; + $breakpoint->label = drupal_ucfirst($name); + $breakpoint->mediaQuery = $media_query; + $breakpoint->source = $id; + $breakpoint->sourceType = $source_type; + $breakpoint->status = TRUE; + $breakpoint->weight = $weight++; + $breakpoint->save(); $breakpoint_group->breakpoints[$breakpoint->id()] = $breakpoint; } return $breakpoint_group; @@ -199,28 +179,15 @@ foreach ($breakpoint_groups->get() as $id => $data) { // Breakpoints is mandatory. if (isset($data['breakpoints']) && !empty($data['breakpoints'])) { - // Use the existing breakpoint group if it exists. - $breakpoint_group = entity_load('breakpoint_group', $source_type . '.' . $id); - if (!$breakpoint_group) { - $breakpoint_group = new BreakpointGroup(); - $breakpoint_group->sourceType = $source_type; - $breakpoint_group->source = $group_id; - $breakpoint_group->id = $id; - if (isset($data['label']) && !empty($data['label'])) { - $breakpoint_group->label = $data['label']; - } - else { - $breakpoint_group->label = drupal_ucfirst($data['label']); - } + $breakpoint_group = new BreakpointGroup(); + $breakpoint_group->sourceType = $source_type; + $breakpoint_group->source = $group_id; + $breakpoint_group->id = $id; + if (isset($data['label']) && !empty($data['label'])) { + $breakpoint_group->label = $data['label']; } else { - // Reset label. - if (isset($data['label']) && !empty($data['label'])) { - $breakpoint_group->label = $data['label']; - } - else { - $breakpoint_group->label = drupal_ucfirst($data['label']); - } + $breakpoint_group->label = drupal_ucfirst($data['label']); } foreach ($data['breakpoints'] as $breakpoint_id => $multipliers) { // Check if breakpoint exists, assume short name.