summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-07-06 19:07:21 +0000
committerDries Buytaert <dries@buytaert.net>2009-07-06 19:07:21 +0000
commite9b4be598aa141896a68e21193d799a7713ed40c (patch)
tree7b3060aa09ad262e11090684a8e3a768f36c6404 /modules/user
parent0d41909829320ec7f48c81d35054269baf8685b6 (diff)
downloadbrdo-e9b4be598aa141896a68e21193d799a7713ed40c.tar.gz
brdo-e9b4be598aa141896a68e21193d799a7713ed40c.tar.bz2
- Patch #306027 by catch et al: user_modules_uninstalled() is missing.
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/user.admin.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 121f4b9b0..fede3de58 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -952,7 +952,9 @@ function user_modules_installed($modules) {
function user_modules_uninstalled($modules) {
$permissions = array();
foreach ($modules as $module) {
- $permissions = array_merge($permissions, array_keys(module_invoke($module, 'permission')));
+ if (drupal_function_exists($module . '_permission')) {
+ $permissions = array_merge($permissions, array_keys(module_invoke($module, 'permission')));
+ }
}
if (!empty($permissions)) {
db_delete('role_permission')