diff options
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_module.php | 4 | ||||
| -rwxr-xr-x | phpBB/includes/mcp/mcp_warn.php | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index b93aca2345..3932e4cdc8 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -251,8 +251,8 @@ class p_master } $is_auth = false; - eval('$is_auth = (int) (' . preg_replace(array('#acl_([a-z_]+)(,\$id)?#e', '#\$id#', '#cfg_([a-z_]+)#e'), array('(int) $auth->acl_get("\\1"\\2)', '$this->acl_forup_id', '(int) $config["\\1"]'), trim($module_auth)) . ');'); - + eval('$is_auth = (int) (' . preg_replace(array('#acl_([a-z_]+)(,\$id)?#', '#\$id#', '#cfg_([a-z_]+)#'), array('(int) $auth->acl_get("\\1"\\2)', '(int) $this->acl_forup_id', '(int) $config["\\1"]'), trim($module_auth)) . ');'); + return $is_auth; } diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index 13d3e20e1a..ccb58f33a8 100755 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -342,14 +342,6 @@ function mcp_warn_user_view($id, $mode, $action) $sql_where = ($user_id) ? "user_id = $user_id" : "username = '" . $db->sql_escape($username) . "'"; -/* $sql = 'SELECT * FROM ' . USERS_TABLE . " WHERE $sql_where"; - $result = $db->sql_query($sql); - - if (!$userrow = $db->sql_fetchrow($result)) - { - trigger_error($user->lang['NO_USER']); - } - $db->sql_freeresult($result);*/ $userrow = get_userdata($user_id); $user_id = $userrow['user_id']; |