Commit 311a25ca authored by webchick's avatar webchick
Browse files

#423822 by JamesAn, agentrickard, and michaelfavia: Update node module to use drupal_static().

parent acae21fe
...@@ -318,7 +318,7 @@ function node_tag_new($nid) { ...@@ -318,7 +318,7 @@ function node_tag_new($nid) {
*/ */
function node_last_viewed($nid) { function node_last_viewed($nid) {
global $user; global $user;
static $history; $history = &drupal_static(__FUNCTION__, array());
if (!isset($history[$nid])) { if (!isset($history[$nid])) {
$history[$nid] = db_query("SELECT timestamp FROM {history} WHERE uid = :uid AND nid = :nid", array(':uid' => $user->uid, ':nid' => $nid))->fetchObject(); $history[$nid] = db_query("SELECT timestamp FROM {history} WHERE uid = :uid AND nid = :nid", array(':uid' => $user->uid, ':nid' => $nid))->fetchObject();
...@@ -339,7 +339,7 @@ function node_last_viewed($nid) { ...@@ -339,7 +339,7 @@ function node_last_viewed($nid) {
*/ */
function node_mark($nid, $timestamp) { function node_mark($nid, $timestamp) {
global $user; global $user;
static $cache; $cache = &drupal_static(__FUNCTION__, array());
if (!$user->uid) { if (!$user->uid) {
return MARK_READ; return MARK_READ;
...@@ -744,7 +744,7 @@ function _node_types_build() { ...@@ -744,7 +744,7 @@ function _node_types_build() {
* A node type object. * A node type object.
*/ */
function node_type_set_defaults($info = array()) { function node_type_set_defaults($info = array()) {
static $type; $type = &drupal_static(__FUNCTION__);
if (!isset($type)) { if (!isset($type)) {
$type = new stdClass(); $type = new stdClass();
...@@ -2658,7 +2658,7 @@ function node_access_grants($op, $account = NULL) { ...@@ -2658,7 +2658,7 @@ function node_access_grants($op, $account = NULL) {
* Determine whether the user has a global viewing grant for all nodes. * Determine whether the user has a global viewing grant for all nodes.
*/ */
function node_access_view_all_nodes() { function node_access_view_all_nodes() {
static $access; $access = &drupal_static(__FUNCTION__);
if (!isset($access)) { if (!isset($access)) {
// If no modules implement the node access system, access is always true. // If no modules implement the node access system, access is always true.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment