From 083770fa3dcb22ea85c3ba5965e209f96f5a63ea Mon Sep 17 00:00:00 2001 From: Michael Stenta Date: Tue, 26 Jan 2016 17:19:39 -0500 Subject: [PATCH] Remove LoginToboggan. --- drupal-org.make | 5 ----- farm.info | 1 - farm.install | 18 +++++++++--------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/drupal-org.make b/drupal-org.make index dc30228ab..b9b6309ee 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -84,11 +84,6 @@ projects[libraries_cdn][version] = "1.7" projects[log][subdir] = "contrib" projects[log][version] = "1.5" -projects[logintoboggan][subdir] = "contrib" -projects[logintoboggan][version] = "1.5" -; Display "Request new password" link in access denied login form. -projects[logintoboggan][patch][] = "http://www.drupal.org/files/issues/logintoboggan-403passwordlink-1823764-5.patch" - projects[navbar][subdir] = "contrib" projects[navbar][version] = "1.7" diff --git a/farm.info b/farm.info index de15f08d2..3821f5c49 100644 --- a/farm.info +++ b/farm.info @@ -32,7 +32,6 @@ dependencies[] = dblog ; Contrib dependencies[] = exif_orientation dependencies[] = libraries_cdn -dependencies[] = logintoboggan dependencies[] = jquery_update dependencies[] = module_filter dependencies[] = navbar diff --git a/farm.install b/farm.install index e53a8e55b..d1912ddeb 100644 --- a/farm.install +++ b/farm.install @@ -23,15 +23,6 @@ function farm_install() { // Use the farm menu for primary links (provided by farm_admin). variable_set('menu_main_links_source', 'farm'); - // Allow login via email (via logintoboggan). - variable_set('logintoboggan_login_with_email', TRUE); - - // Display the login form on access denied pages (via logintoboggan). - variable_set('site_403', 'toboggan/denied'); - - // Show "Request new password" link on 403 pages (via LoginToboggan). - variable_set('logintoboggan_site_403_user_login_block', TRUE); - // Load Openlayers 3.11.2 from CDNJS. \Drupal\openlayers\Config::set('openlayers.variant', 'cdnjs:ol3:3.11.2'); } @@ -316,6 +307,15 @@ function farm_update_7015(&$sandbox) { drupal_uninstall_modules(array($modules)); } +/** + * Uninstall Logintoboggan. + */ +function farm_update_7016(&$sandbox) { + variable_del('site_403'); + variable_del('logintoboggan_login_with_email'); + variable_del('logintoboggan_site_403_user_login_block'); +} + /** * Helper function: enable modules. */