summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Rothstein2015-04-21 02:39:39 (GMT)
committer David Rothstein2015-04-21 02:39:39 (GMT)
commite091df1aa7cfa5341984f3dc323610053e73fa88 (patch)
tree3a41fc2ae2c3da21f4ba20542d733324227f2ba7
parent8f08dc9d13f43651fc8c298253891036c2ea8e8f (diff)
Issue #1684930 by amontero, David_Rothstein, joshi.rohit100, jthorson, dcam, rpayanm, jackbravo, yoroy: Add description to "administer filters" permission7.x
-rw-r--r--CHANGELOG.txt2
-rw-r--r--modules/filter/filter.module1
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d8cef60..fd16a48 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,8 @@
Drupal 7.37, xxxx-xx-xx (development version)
-----------------------
+- Added a description to the "Administer text formats and filters" permission
+ on the Permissions page (string change).
Drupal 7.36, 2015-04-01
-----------------------
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 74621f1..f4bab9e 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -340,6 +340,7 @@ function filter_admin_format_title($format) {
function filter_permission() {
$perms['administer filters'] = array(
'title' => t('Administer text formats and filters'),
+ 'description' => t('Define how text is handled by combining filters into <a href="@url">text formats</a>.', array('@url' => url('admin/config/content/formats'))),
'restrict access' => TRUE,
);