diff --git a/memcache_admin/memcache_admin.module b/memcache_admin/memcache_admin.module index 7b21a11..269e147 100644 --- a/memcache_admin/memcache_admin.module +++ b/memcache_admin/memcache_admin.module @@ -7,13 +7,8 @@ */ function memcache_admin_init() { global $user; - if (($user->uid == 0) || strstr($_SERVER['PHP_SELF'], 'update.php') || strstr($_GET['q'], 'autocomplete')) { - // update.php relies on standard error handler - } - else { - if ($user->uid) { - drupal_add_js(drupal_get_path('module', 'memcache_admin'). '/memcache.js'); - } + if ($user->uid && variable_get('show_memcache_statistics', TRUE) && user_access('access memcache statistics') && (!defined + drupal_add_js(drupal_get_path('module', 'memcache_admin'). '/memcache.js'); register_shutdown_function('memcache_admin_shutdown'); } } @@ -230,18 +225,16 @@ function memcache_admin_shutdown() { } } - if (variable_get('show_memcache_statistics', TRUE) && function_exists('user_access') && user_access('access memcache stati - if (!empty($_memcache_statistics)) { - foreach ($_memcache_statistics as $row => $stats) { - $_memcache_statistics[$row][1] = check_plain($stats[1]); - $_memcache_statistics[$row][2] = check_plain($stats[2]); - } + if (variable_get('show_memcache_statistics', TRUE) && !empty($_memcache_statistics)) { + foreach ($_memcache_statistics as $row => $stats) { + $_memcache_statistics[$row][1] = check_plain($stats[1]); + $_memcache_statistics[$row][2] = check_plain($stats[2]); + } - $headers = array(t('Operation'), t('Bin'), t('Key'), t('Hit')); - $output = theme('table', $headers, $_memcache_statistics); + $headers = array(t('Operation'), t('Bin'), t('Key'), t('Hit')); + $output = theme('table', $headers, $_memcache_statistics); - // this makes sure all of the HTML is within the even though this