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

- Patch #1273206 by droplet: access global when it essentially needed.

8.0.x
Dries Buytaert 2011-09-16 17:53:59 -04:00
parent 403850336c
commit cf9b0d63ed
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/node/node.module
View File

@ -2833,8 +2833,6 @@ function node_search_validate($form, &$form_state) {
* TRUE if the operation may be performed, FALSE otherwise. * TRUE if the operation may be performed, FALSE otherwise.
*/ */
function node_access($op, $node, $account = NULL) { function node_access($op, $node, $account = NULL) {
global $user;
$rights = &drupal_static(__FUNCTION__, array()); $rights = &drupal_static(__FUNCTION__, array());
if (!$node || !in_array($op, array('view', 'update', 'delete', 'create'), TRUE)) { if (!$node || !in_array($op, array('view', 'update', 'delete', 'create'), TRUE)) {
@ -2844,7 +2842,7 @@ function node_access($op, $node, $account = NULL) {
} }
// If no user object is supplied, the access check is for the current user. // If no user object is supplied, the access check is for the current user.
if (empty($account)) { if (empty($account)) {
$account = $user; $account = $GLOBALS['user'];
} }
// $node may be either an object or a node type. Since node types cannot be // $node may be either an object or a node type. Since node types cannot be