From 0d2a4bcd3465da910d7d35706dd6ac0f5cecfac3 Mon Sep 17 00:00:00 2001
From: Shawn Kwang <kwangs@uwm.edu>
Date: Thu, 16 Apr 2020 10:49:03 -0500
Subject: [PATCH] Drupal: Changes to Feature boinc_standard.

Added user_roles to Feature, needed for CKEditor.
Fixed array declaration that was overriding the Feature.
Removed old wysiwyg code.
---
 .../boinc_standard.features.ckeditor_profile.inc           | 4 +---
 .../features/boinc_standard/boinc_standard.features.inc    | 3 ---
 .../sites/all/features/boinc_standard/boinc_standard.info  | 7 +++++++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drupal/sites/all/features/boinc_standard/boinc_standard.features.ckeditor_profile.inc b/drupal/sites/all/features/boinc_standard/boinc_standard.features.ckeditor_profile.inc
index c907285667..6352a4da2a 100644
--- a/drupal/sites/all/features/boinc_standard/boinc_standard.features.ckeditor_profile.inc
+++ b/drupal/sites/all/features/boinc_standard/boinc_standard.features.ckeditor_profile.inc
@@ -96,9 +96,7 @@ function boinc_standard_ckeditor_profile_defaults() {
         'excl_regex' => '',
         'simple_incl_regex' => '',
       ),
-      'roles' => array(
-        '' => NULL,
-      ),
+      'roles' => array(),
     ),
     'CKEditor Global Profile' => array(
       'name' => 'CKEditor Global Profile',
diff --git a/drupal/sites/all/features/boinc_standard/boinc_standard.features.inc b/drupal/sites/all/features/boinc_standard/boinc_standard.features.inc
index 05bef2f7c6..6d7813ee4a 100644
--- a/drupal/sites/all/features/boinc_standard/boinc_standard.features.inc
+++ b/drupal/sites/all/features/boinc_standard/boinc_standard.features.inc
@@ -17,9 +17,6 @@ function boinc_standard_ctools_plugin_api() {
   elseif ($module == "strongarm" && $api == "strongarm") {
     return array("version" => 1);
   }
-  elseif ($module == "wysiwyg" && $api == "wysiwyg") {
-    return array("version" => 2);
-  }
 }
 
 /**
diff --git a/drupal/sites/all/features/boinc_standard/boinc_standard.info b/drupal/sites/all/features/boinc_standard/boinc_standard.info
index e9545ed897..dee01cc8c9 100644
--- a/drupal/sites/all/features/boinc_standard/boinc_standard.info
+++ b/drupal/sites/all/features/boinc_standard/boinc_standard.info
@@ -184,6 +184,13 @@ features[user_permission][] = "view all panes"
 features[user_permission][] = "view pane admin links"
 features[user_permission][] = "view revisions"
 features[user_permission][] = "view uploaded files"
+features[user_role][] = "administrator"
+features[user_role][] = "anonymous user"
+features[user_role][] = "authenticated user"
+features[user_role][] = "community member"
+features[user_role][] = "content editor"
+features[user_role][] = "moderator"
+features[user_role][] = "verified contributor"
 features[variable][] = "admin_theme"
 features[variable][] = "bbcode_debug_4"
 features[variable][] = "bbcode_debug_6"