Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #1037352 by David_Rothstein: removed conflict.

8.0.x
Dries Buytaert 2011-03-27 19:41:15 -04:00
parent df0e13bd1c
commit 6ebfd9cfc7
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/system/system.api.php
View File

@ -1908,7 +1908,6 @@ function hook_system_info_alter(&$info, $file, $type) {
* have inherent security risks across a variety of potential use cases * have inherent security risks across a variety of potential use cases
* (for example, the "administer filters" and "bypass node access" * (for example, the "administer filters" and "bypass node access"
* permissions provided by Drupal core). When set to TRUE, a standard * permissions provided by Drupal core). When set to TRUE, a standard
<<<<<<< HEAD
* warning message defined in user_admin_permissions() and output via * warning message defined in user_admin_permissions() and output via
* theme_user_permission_description() will be associated with the * theme_user_permission_description() will be associated with the
* permission and displayed with it on the permission administration page. * permission and displayed with it on the permission administration page.
@ -1922,14 +1921,6 @@ function hook_system_info_alter(&$info, $file, $type) {
* is specific to the permission you are defining. * is specific to the permission you are defining.
* *
* @see theme_user_permission_description() * @see theme_user_permission_description()
=======
* warning message defined in user_admin_permissions() will be associated
* with the permission and displayed with it on the permission
* administration page. Defaults to FALSE.
* - warning: (optional) A translated warning message to display on the
* permission administration page. This warning overrides the automatic
* warning generated by 'restrict access' being set to TRUE.
>>>>>>> f1ba363a8c3b5185e4e663bd2c3b7eb7b0fb9983
*/ */
function hook_permission() { function hook_permission() {
return array( return array(