Use new version of the Related Links feature and remove it from the lite profile

src/cambridge/cambridge.info

@@ -34,6 +34,7 @@ dependencies[] = ckeditor
 dependencies[] = date
 dependencies[] = email
 dependencies[] = features
+dependencies[] = fe_block
 dependencies[] = field_collection
 dependencies[] = globalredirect
 dependencies[] = imagecrop

src/cambridge/cambridge.install

@@ -139,6 +139,27 @@ function cambridge_install() {
         ),
       ),
     ),
+    array(
+      'entity_type' => 'node',
+      'bundle' => 'page',
+      'field_name' => 'field_related_links',
+      'label' => st('Related links'),
+      'cardinality' => -1,
+      'type' => 'field_related_links',
+      'settings' => array(
+        'title' => 'required',
+      ),
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'type' => 'hidden',
+        ),
+        'teaser' => array(
+          'label' => 'hidden',
+          'type' => 'hidden',
+        ),
+      ),
+    ),
   );
 
   foreach ($instances as $instance) {
@@ -431,4 +452,7 @@ function cambridge_install() {
       )
     )
     ->execute();
+
+  // FE Block settings don't appear to be right at this point, so...
+  features_revert();
 }

src/cambridge/cambridge.make

@@ -23,6 +23,7 @@ projects[fancybox][subdir] = "patched"
 projects[fancybox][patch][] = "https://gist.github.com/thewilkybarkid/6550012/raw/27aa33685c0f484b6e1b9f63d61e98d73af9775b/fancybox_jquery.patch"
 libraries[fancybox][download][type] = "file"
 libraries[fancybox][download][url] = "https://github.com/fancyapps/fancyBox/archive/v2.1.5.tar.gz"
+projects[features_extra] = "1.0-beta1"
 projects[feeds] = "2.0-alpha8"
 projects[field_collection][version] = "1.0-beta5"
 projects[field_collection][subdir] = "patched"
@@ -63,6 +64,11 @@ projects[workbench_moderation] = "1.3"
 projects[body_field_definition][version] = "1.0"
 projects[body_field_definition][subdir] = "features"
 
+projects[cambridge_related_links][type] = "module"
+projects[cambridge_related_links][download][type] = "file"
+projects[cambridge_related_links][download][url] = "https://github.com/misd-service-development/drupal-feature-related-links/archive/master.tar.gz"
+projects[cambridge_related_links][subdir] = "features"
+
 projects[cambridge_questions_and_answers][type] = "module"
 projects[cambridge_questions_and_answers][download][type] = "file"
 projects[cambridge_questions_and_answers][download][url] = "https://github.com/misd-service-development/drupal-feature-questions-and-answers/archive/master.tar.gz"

src/cambridge_base.inc

@@ -172,27 +172,6 @@ function cambridge_base_install() {
         ),
       ),
     ),
-    array(
-      'entity_type' => 'node',
-      'bundle' => 'page',
-      'field_name' => 'field_related_links',
-      'label' => st('Related links'),
-      'cardinality' => -1,
-      'type' => 'field_related_links',
-      'settings' => array(
-        'title' => 'required',
-      ),
-      'display' => array(
-        'default' => array(
-          'label' => 'above',
-          'type' => 'hidden',
-        ),
-        'teaser' => array(
-          'label' => 'hidden',
-          'type' => 'hidden',
-        ),
-      ),
-    ),
     array(
       'entity_type' => 'node',
       'bundle' => 'link',
@@ -423,15 +402,13 @@ function cambridge_base_install() {
     ),
   );
 
-  $query = db_insert('block')
-    ->fields(array('module', 'delta', 'theme', 'status', 'weight', 'region', 'pages', 'title', 'cache'));
-
   foreach ($blocks as $block) {
-    $query->values($block);
+    db_merge('block')
+      ->key(array('module' => $block['module'], 'delta' => $block['delta'], 'theme' => $theme))
+      ->fields($block)
+      ->execute();
   }
 
-  $query->execute();
-
   // Insert default pre-defined RDF mapping into the database.
   $rdf_mappings = array(
     array(
@@ -560,26 +537,6 @@ function cambridge_base_install() {
     )
     ->execute();
 
-  // Make the related links view block visible in the sidebar.
-
-  db_insert('block')
-    ->fields(
-      array(
-        'module' => 'views',
-        'delta' => 'related_links-block',
-        'theme' => 'cambridge_theme',
-        'status' => TRUE,
-        'weight' => -10,
-        'region' => 'sidebar',
-        'custom' => BLOCK_CUSTOM_FIXED,
-        'visibility' => BLOCK_VISIBILITY_NOTLISTED,
-        'pages' => '',
-        'title' => '',
-        'cache' => DRUPAL_NO_CACHE,
-      )
-    )
-    ->execute();
-
   // Set some sensible defaults for the Image javascript crop module.
 
   variable_set('imagecrop_popup', 'basic');

src/cambridge_base.make

@@ -51,11 +51,6 @@ projects[cambridge_news][download][type] = "file"
 projects[cambridge_news][download][url] = "https://github.com/misd-service-development/drupal-feature-news/archive/7.x-1.0.tar.gz"
 projects[cambridge_news][subdir] = "features"
 
-projects[cambridge_related_links][type] = "module"
-projects[cambridge_related_links][download][type] = "file"
-projects[cambridge_related_links][download][url] = "https://github.com/misd-service-development/drupal-feature-related-links/archive/7.x-1.0.tar.gz"
-projects[cambridge_related_links][subdir] = "features"
-
 projects[cambridge_teasers][type] = "module"
 projects[cambridge_teasers][download][type] = "file"
 projects[cambridge_teasers][download][url] = "https://github.com/misd-service-development/drupal-feature-teasers/archive/7.x-1.0.tar.gz"

src/cambridge_lite/cambridge_lite.info

@@ -40,5 +40,4 @@ dependencies[] = cambridge_carousel
 dependencies[] = cambridge_image_styles
 dependencies[] = cambridge_link
 dependencies[] = cambridge_news
-dependencies[] = cambridge_related_links
 dependencies[] = cambridge_teasers