diff options
| -rw-r--r-- | CHANGELOG.txt | 3 | ||||
| -rw-r--r-- | modules/filter/filter.module | 4 | ||||
| -rw-r--r-- | modules/node/node.module | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a48b6e99d..a8be58cdc 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,9 @@ Drupal 7.36, xxxx-xx-xx (development version) ----------------------- +- Changed permission descriptions throughout Drupal core to consistently link + to relevant administrative pages, regardless of whether the user viewing the + Permissions page can view the page being linked to (minor UI change). - Fixed the drupal_add_region_content() function so that it actually adds content to the page. - Added an 'image_suppress_itok_output' variable to allow sites already using diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 5c2b8c97f..74621f108 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -348,9 +348,7 @@ function filter_permission() { foreach (filter_formats() as $format) { $permission = filter_permission_name($format); if (!empty($permission)) { - // Only link to the text format configuration page if the user who is - // viewing this will have access to that page. - $format_name_replacement = user_access('administer filters') ? l($format->name, 'admin/config/content/formats/' . $format->format) : drupal_placeholder($format->name); + $format_name_replacement = l($format->name, 'admin/config/content/formats/' . $format->format); $perms[$permission] = array( 'title' => t("Use the !text_format text format", array('!text_format' => $format_name_replacement,)), 'description' => drupal_placeholder(t('Warning: This permission may have security implications depending on how the text format is configured.')), diff --git a/modules/node/node.module b/modules/node/node.module index ebac07902..a9c1d23e8 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1578,9 +1578,7 @@ function node_permission() { ), 'access content overview' => array( 'title' => t('Access the content overview page'), - 'description' => user_access('access content overview') - ? t('Get an overview of <a href="@url">all content</a>.', array('@url' => url('admin/content'))) - : t('Get an overview of all content.'), + 'description' => t('Get an overview of <a href="@url">all content</a>.', array('@url' => url('admin/content'))), ), 'access content' => array( 'title' => t('View published content'), |