Skip to content

Commit

Permalink
Add cleanup from Profile module
Browse files Browse the repository at this point in the history
Add cleanup of residue from Profile modules. Small tweaks to titles and descriptions of admin pages.
  • Loading branch information
bugfolder committed Jan 14, 2021
1 parent 1529ea1 commit d2e1cee
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 6 deletions.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,18 @@ Upgrading from Drupal 7
-----------------------

This module is the successor to the [Drupal 7 Profile2
module](https://drupal.org/project/profile2) and will automatically import and
module](https://drupal.org/project/profile2) and can automatically import and
convert any Profile2 profiles when upgrading from a Drupal 7 installation.

Note that this module does NOT import from the [deprecated Profile
Note that this module does _not_ import from the [deprecated Profile
module](https://www.drupal.org/node/874026) that was provided in Drupal 7 core
as an upgrade path from Drupal 6 sites that used Profiles. If you have profiles
from the Drupal 7 Profile module, you should either convert them to Profile2
profiles in Drupal 7 prior to upgrading to Backdrop, or recreate them in
Backdrop after you upgrade.

If you are migrating Drupal 7 Profile2 profiles to Backdrop Profile, you should, however, _enable_ the Drupal 7 Profile module before preparing the db for migration.

Documentation
-------------

Expand Down Expand Up @@ -65,3 +67,4 @@ Credits:
* [Wolfgang Ziegler (fago)](https://www.drupal.org/u/fago), [email protected]
* [Joachim Noreiko (joachim)](https://www.drupal.org/u/joachim), [email protected]

``
4 changes: 2 additions & 2 deletions profile.admin.inc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function profile_display_settings_form($form, &$form_state) {
'#value' => t('Save configuration'),
'#weight' => 40,
);

return $form;
}

Expand Down Expand Up @@ -119,7 +119,7 @@ function profile_type_form($form, &$form_state, $profile_type, $op = 'edit') {
'#submit' => array('profile_type_form_submit_delete')
);
}

return $form;
}

Expand Down
8 changes: 8 additions & 0 deletions profile.install
Original file line number Diff line number Diff line change
Expand Up @@ -236,3 +236,11 @@ function profile_update_1001() {
WHERE name = 'profile2'
AND type = 'module'");
}

/**
* Drop any leftover D7 Profile module tables.
*/
function profile_update_1002() {
db_drop_table('profile_field');
db_drop_table('profile_value');
}
4 changes: 2 additions & 2 deletions profile.module
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@ function profile_menu() {
);

$items['admin/config/people/profiles'] = array(
'title' => 'Profile display settings',
'title' => 'Profile display',
'page callback' => 'backdrop_get_form',
'page arguments' => array('profile_display_settings_form'),
'description' => 'Profile display settings form.',
'description' => 'Configure how profile edit forms are displayed when editing accounts.',
'access arguments' => array('administer profile'),
'file' => 'profile.admin.inc',
);
Expand Down

0 comments on commit d2e1cee

Please sign in to comment.