Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
UNL-CMS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Eric Rasmussen
UNL-CMS
Commits
fdb2b748
Commit
fdb2b748
authored
12 years ago
by
Eric Rasmussen
Browse files
Options
Downloads
Patches
Plain Diff
[gh-447] Don't show global administrators on admin/people
parent
7b99b420
Branches
issue-447
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
sites/all/modules/unl/unl.module
+6
-6
6 additions, 6 deletions
sites/all/modules/unl/unl.module
with
6 additions
and
6 deletions
sites/all/modules/unl/unl.module
+
6
−
6
View file @
fdb2b748
...
@@ -1508,8 +1508,10 @@ function unl_query_alter(QueryAlterableInterface $query) {
...
@@ -1508,8 +1508,10 @@ function unl_query_alter(QueryAlterableInterface $query) {
}
}
// If we actually find a users table
// If we actually find a users table
if
(
$usersTableAlias
)
{
if
(
$usersTableAlias
)
{
// Join it with the users_roles tables so that only users with roles are seleceted.
// Join it with the users_roles tables so that only users with roles are seleceted AND role is not admin.
$query
->
join
(
'users_roles'
,
'unl_distinct_prefix_r'
,
$usersTableAlias
.
'.uid = unl_distinct_prefix_r.uid'
);
$query
->
join
(
'users_roles'
,
'unl_distinct_prefix_r'
,
$usersTableAlias
.
'.uid = unl_distinct_prefix_r.uid'
.
' AND unl_distinct_prefix_r.rid != '
.
unl_shared_variable_get
(
'user_admin_role'
,
0
));
}
}
}
}
}
}
...
@@ -1517,8 +1519,7 @@ function unl_query_alter(QueryAlterableInterface $query) {
...
@@ -1517,8 +1519,7 @@ function unl_query_alter(QueryAlterableInterface $query) {
/**
/**
* Implementation of hook_filter_info()
* Implementation of hook_filter_info()
*/
*/
function
unl_filter_info
()
function
unl_filter_info
()
{
{
return
array
(
return
array
(
'unl_embed'
=>
array
(
'unl_embed'
=>
array
(
'title'
=>
'UNL Node Embed'
,
'title'
=>
'UNL Node Embed'
,
...
@@ -1540,8 +1541,7 @@ function unl_filter_info()
...
@@ -1540,8 +1541,7 @@ function unl_filter_info()
*
*
* Replace any instances of [[node:X]] in the $text with the content of node X's body.
* Replace any instances of [[node:X]] in the $text with the content of node X's body.
*/
*/
function
unl_filter_embed_process
(
$text
,
$filter
,
$format
,
$langcode
,
$cache
,
$cache_id
)
function
unl_filter_embed_process
(
$text
,
$filter
,
$format
,
$langcode
,
$cache
,
$cache_id
)
{
{
static
$processed_hashes
=
array
();
static
$processed_hashes
=
array
();
$text_hash
=
hash
(
'sha256'
,
$text
);
$text_hash
=
hash
(
'sha256'
,
$text
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment