diff --git a/.htaccess b/.htaccess diff --git a/CHANGELOG.txt b/CHANGELOG.txt diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt diff --git a/INSTALL.mysql.txt b/INSTALL.mysql.txt diff --git a/INSTALL.pgsql.txt b/INSTALL.pgsql.txt diff --git a/INSTALL.sqlite.txt b/INSTALL.sqlite.txt diff --git a/INSTALL.txt b/INSTALL.txt diff --git a/LICENSE.txt b/LICENSE.txt diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt diff --git a/README.txt b/README.txt diff --git a/UPGRADE.txt b/UPGRADE.txt diff --git a/authorize.php b/authorize.php diff --git a/cron.php b/cron.php diff --git a/example.gitignore b/example.gitignore diff --git a/includes/common.inc b/includes/common.inc index 0c6c9eb..8331fab 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -106,7 +106,6 @@ define('HTTP_REQUEST_TIMEOUT', -1); * Blocks requiring more fine-grained clearing might consider disabling the * built-in block cache (DRUPAL_NO_CACHE) and roll their own. * - * Note that user 1 is excluded from block caching. */ /** diff --git a/index.php b/index.php diff --git a/install.php b/install.php diff --git a/modules/block/block.module b/modules/block/block.module index d1c8039..f57d16b 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -886,11 +886,7 @@ function _block_render_blocks($region_blocks) { function _block_get_cache_id($block) { global $user; - // User 1 being out of the regular 'roles define permissions' schema, - // it brings too many chances of having unwanted output get in the cache - // and later be served to other users. We therefore exclude user 1 from - // block caching. - if (variable_get('block_cache', FALSE) && !in_array($block->cache, array(DRUPAL_NO_CACHE, DRUPAL_CACHE_CUSTOM)) && $user->uid != 1) { + if (variable_get('block_cache', FALSE) && !in_array($block->cache, array(DRUPAL_NO_CACHE, DRUPAL_CACHE_CUSTOM))) { // Start with common sub-patterns: block identification, theme, language. $cid_parts[] = $block->module; $cid_parts[] = $block->delta; diff --git a/modules/node/node.module b/modules/node/node.module index 30e9559..96a2b86 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -2778,7 +2778,7 @@ function node_search_validate($form, &$form_state) { * * In determining access rights for a node, node_access() first checks * whether the user has the "bypass node access" permission. Such users have - * unrestricted access to all nodes. user 1 will always pass this check. + * unrestricted access to all nodes. * * Next, all implementations of hook_node_access() will be called. Each * implementation may explicitly allow, explicitly deny, or ignore the access diff --git a/modules/system/system.api.php b/modules/system/system.api.php index ec7f6b8..2cf0dce 100644 --- a/modules/system/system.api.php +++ b/modules/system/system.api.php @@ -2752,11 +2752,6 @@ function hook_file_download($uri) { function hook_file_url_alter(&$uri) { global $user; - // User 1 will always see the local file in this example. - if ($user->uid == 1) { - return; - } - $cdn1 = 'http://cdn1.example.com'; $cdn2 = 'http://cdn2.example.com'; $cdn_extensions = array('css', 'js', 'gif', 'jpg', 'jpeg', 'png'); diff --git a/modules/user/user.module b/modules/user/user.module index 1355159..e45f6c2 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -786,11 +786,6 @@ function user_access($string, $account = NULL) { $account = $user; } - // User #1 has all privileges: - if ($account->uid == 1) { - return TRUE; - } - // To reduce the number of SQL queries, we cache the user's permissions // in a static variable. // Use the advanced drupal_static() pattern, since this is called very often. @@ -3199,10 +3194,6 @@ function user_multiple_cancel_confirm($form, &$form_state) { $form['accounts'] = array('#prefix' => '