Merge conflicts with frjo

colorbox.info.yml

@@ -3,3 +3,4 @@ type: module
 description: 'A light-weight, customizable lightbox plugin for jQuery 1.4.3+.'
 core: 8.x
 configure: admin/config/media/colorbox
+package: Media

colorbox.install

@@ -8,6 +8,7 @@
 /**
  * Implements hook_requirements().
  */
+/*
 function colorbox_requirements($phase) {
   return;
   $requirements = array();

colorbox.module

@@ -117,6 +117,7 @@ function _colorbox_active() {
 
   $current_path = current_path();
   // Code from the block_list funtion in block.module.
+
   $path = Drupal::service('path.alias_manager.cached')->getPathAlias($current_path);
   $colorbox_pages = $config->get('colorbox_pages');
   // Compare with the internal and path alias (if any).

lib/Drupal/colorbox/Form/ColorboxSettingsForm.php

@@ -377,11 +377,11 @@ class ColorboxSettingsForm extends SystemConfigFormBase {
       ->set('advanced.compression_type', $form_values['colorbox_compression_type']);
 
     if (isset($form_values['colorbox_image_style'])) {
-      $config->set('insert.image_style', 'colorbox_image_style');
+      $config->set('insert.image_style', $form_values['colorbox_image_style']);
     }
 
     if (isset($form_values['colorbox_insert_gallery'])) {
-      $config->set('insert.insert_gallery', 'colorbox_insert_gallery');
+      $config->set('insert.insert_gallery', $form_values['colorbox_insert_gallery']);
     }
 
     $config->save();

lib/Drupal/colorbox/Plugin/field/formatter/ColorboxFormatter.php

@@ -39,7 +39,6 @@ class ColorboxFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function settingsForm(array $form, array &$form_state) {
-
     $image_styles = image_style_options(FALSE);
     $image_styles_hide = $image_styles;
     $image_styles_hide['hide'] = t('Hide (do not display image)');
@@ -199,6 +198,7 @@ class ColorboxFormatter extends FormatterBase {
       'custom' => t('Custom (with tokens)'),
       'none' => t('None'),
     );
+
     if ($this->getSetting('colorbox_caption')) {
       $summary[] = t('Colorbox caption: @type', array('@type' => $caption[$this->getSetting('colorbox_caption')]));
     }