From 2bf7c1c0e39c657db47607bb7ecdf95753ae15b4 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Thu, 28 Jun 2007 07:48:41 +0000 Subject: - Patch #147662 by Gordon et al: add new #pre_render callback to drupal_render(). --- modules/node/node.module | 2 +- modules/user/user.module | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'modules') diff --git a/modules/node/node.module b/modules/node/node.module index 02f2eae2b..c8b2208f4 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -3091,7 +3091,7 @@ function node_content_access($op, $node) { return TRUE; } } - + if ($op == 'delete') { if (user_access('delete '. $type .' content') || (user_access('delete own '. $type .' content') && ($user->uid == $node->uid))) { return TRUE; diff --git a/modules/user/user.module b/modules/user/user.module index f9b5d69b5..ca4c2856e 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -522,13 +522,13 @@ function user_search($op = 'search', $keys = NULL, $skip_access_check = FALSE) { // Administrators can also search in the otherwise private email field. $result = pager_query("SELECT name, uid, mail FROM {users} WHERE LOWER(name) LIKE LOWER('%%%s%%') OR LOWER(mail) LIKE LOWER('%%%s%%')", 15, 0, NULL, $keys, $keys); while ($account = db_fetch_object($result)) { - $find[] = array('title' => $account->name .' ('. $account->mail .')', 'link' => url('user/'. $account->uid, array('absolute' => TRUE))); + $find[] = array('title' => $account->name .' ('. $account->mail .')', 'link' => url('user/'. $account->uid, array('absolute' => TRUE))); } } else { - $result = pager_query("SELECT name, uid FROM {users} WHERE LOWER(name) LIKE LOWER('%%%s%%')", 15, 0, NULL, $keys); + $result = pager_query("SELECT name, uid FROM {users} WHERE LOWER(name) LIKE LOWER('%%%s%%')", 15, 0, NULL, $keys); while ($account = db_fetch_object($result)) { - $find[] = array('title' => $account->name, 'link' => url('user/'. $account->uid, array('absolute' => TRUE))); + $find[] = array('title' => $account->name, 'link' => url('user/'. $account->uid, array('absolute' => TRUE))); } } return $find; -- cgit v1.2.3