summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2006-02-16 15:36:31 +0000
committerDries Buytaert <dries@buytaert.net>2006-02-16 15:36:31 +0000
commitdca43564dfb8bd1c964f1449f34d4fc03af43f95 (patch)
tree695dc4d35e989d545b9520fe8828b44a873a52ad
parenteeae26b227b4b4fdf44f0242a003edf7cc7c7c46 (diff)
downloadbrdo-dca43564dfb8bd1c964f1449f34d4fc03af43f95.tar.gz
brdo-dca43564dfb8bd1c964f1449f34d4fc03af43f95.tar.bz2
- Patch #49198 by Ber: improved documentation of filter-roles setting.
-rw-r--r--modules/filter.module2
-rw-r--r--modules/filter/filter.module2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/filter.module b/modules/filter.module
index 422045543..f02d3b909 100644
--- a/modules/filter.module
+++ b/modules/filter.module
@@ -413,7 +413,7 @@ function filter_admin_format_form($format) {
$form['name']['name'] = array('#type' => 'textfield', '#default_value' => $format->name, '#description' => t('Give the name of this filter format'), '#required' => TRUE);
//Add a row of checkboxes for form group
- $form['roles'] = array('#type' => 'fieldset', '#title' => t('Roles'), '#description' => $default ? $help : t('Choose which roles may use this filter format.'), '#tree' => TRUE);
+ $form['roles'] = array('#type' => 'fieldset', '#title' => t('Roles'), '#description' => $default ? $help : t('Choose which roles may use this filter format. Note that people who have the "administer filters" permission always get to use all the filter formats.'), '#tree' => TRUE);
$form['roles']['hidden'] = array();
foreach (user_roles() as $rid => $name) {
$checked = strstr($format->roles, ",$rid,");
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 422045543..f02d3b909 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -413,7 +413,7 @@ function filter_admin_format_form($format) {
$form['name']['name'] = array('#type' => 'textfield', '#default_value' => $format->name, '#description' => t('Give the name of this filter format'), '#required' => TRUE);
//Add a row of checkboxes for form group
- $form['roles'] = array('#type' => 'fieldset', '#title' => t('Roles'), '#description' => $default ? $help : t('Choose which roles may use this filter format.'), '#tree' => TRUE);
+ $form['roles'] = array('#type' => 'fieldset', '#title' => t('Roles'), '#description' => $default ? $help : t('Choose which roles may use this filter format. Note that people who have the "administer filters" permission always get to use all the filter formats.'), '#tree' => TRUE);
$form['roles']['hidden'] = array();
foreach (user_roles() as $rid => $name) {
$checked = strstr($format->roles, ",$rid,");