diff -P --exclude .svn -ur contrib/adsense/adsense.admin.inc patched/adsense/adsense.admin.inc
--- contrib/adsense/adsense.admin.inc 2008-09-11 15:51:59.000000000 -0700
+++ contrib/adsense/adsense.admin.inc 2008-11-06 05:50:19.000000000 -0800
@@ -71,6 +71,13 @@
     '#description' => t('This disables all display of Google AdSense ads from your web site. This is useful in certain situations, such as site upgrades, or if you make a copy of the site for development and test purposes.'),
   );
 
+  $form['advanced']['adsense_disable_admin'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Disable Google AdSense ads for admin?'),
+    '#default_value' => variable_get('adsense_disable_admin', ADSENSE_DISABLE_ADMIN_DEFAULT),
+    '#description' => t('Adsense can be disabled for individual users via the %perm (!perm_link). The admin user is automatically granted all permissions. This setting overrides the %perm for the admin user and can be used to allow the admin user to see ads.', array('%perm' => 'hide adsense', '!perm_link' => l('user permissions', '/admin/user/permissions'))),
+  );
+
   $form['advanced']['adsense_placeholder'] = array(
     '#type' => 'checkbox',
     '#title' => t('Placeholder when ads are disabled?'),
diff -P --exclude .svn -ur contrib/adsense/adsense.module patched/adsense/adsense.module
--- contrib/adsense/adsense.module  2008-11-06 05:52:34.000000000 -0800
+++ contrib/adsense/adsense.module  2008-11-06 05:49:53.000000000 -0800
@@ -20,6 +20,7 @@
 define('ADSENSE_ACCESS_PAGES_DEFAULT', '');
 define('ADSENSE_BASIC_ID_DEFAULT', '');
 define('ADSENSE_DISABLE_DEFAULT', 0);
+define('ADSENSE_DISABLE_ADMIN_DEFAULT', 1);
 define('ADSENSE_ID_MODULE_DEFAULT', 'adsense_basic');
 define('ADSENSE_PLACEHOLDER_DEFAULT', 1);
 define('ADSENSE_PLACEHOLDER_TEXT_DEFAULT', t('Google AdSense'));
@@ -376,6 +377,7 @@
   }
 
   $ad = adsense_ad_formats($args['format']);
+
   if ($ad === NULL) {
     $ad = '<!--adsense: invalid format: '. $args['format'] .'-->';
   }
@@ -463,7 +465,9 @@
   if (variable_get('adsense_test_mode', ADSENSE_TEST_MODE_DEFAULT)) {
     return TRUE;
   }
-  if (user_access('hide adsense')) {
+  // Sometimes the site-admin may wish to see the ads! Since admins always have ALL permissions add an additional check
+  global $user;
+  if (($user->uid == 1 && variable_get('adsense_disable_admin', ADSENSE_DISABLE_ADMIN_DEFAULT)) || ($user->uid != 1 && user_access('hide adsense'))) {
     return FALSE;
   }
 
diff -P --exclude .svn -ur contrib/adsense/help/adsense.help.inc patched/adsense/help/adsense.help.inc
--- contrib/adsense/help/adsense.help.inc 2008-09-11 16:12:35.000000000 -0700
+++ contrib/adsense/help/adsense.help.inc 2008-11-06 05:50:47.000000000 -0800
@@ -32,6 +32,15 @@
   $ad_formats_text = theme('table', $headers, $rows);
 
   $referral_link = 'http://baheyeldin.com/click/476/1';
+  if (module_exists('adsense_cse')) {
+    $custom_search_link = l(t('Custom search help'), '/admin/settings/adsense/cse');
+error_log(__LINE__ . ": $custom_search_link");
+  }
+  else {
+    $custom_search_link = t('Adsense CSE module (which must be enabled; !link) and refer to its help', array('!link' => l('modules', 'admin/build/modules')));
+error_log(__LINE__ . ": $custom_search_link");
+  }
+    
 
   $output = <<<EOF
 <h2>Overview</h2>
@@ -62,7 +71,7 @@
 <h3>Using blocks</h3>
 <p>The easiest way to get started with this module is to use one or more of
 the pre-defined blocks.</p>
-<p>Visit the <a href="$base/admin/build/block">blocks</a> configuration page,
+<p>Visit the <a href="/admin/build/block">blocks</a> configuration page,
 and click on the <strong>configure</strong> link of one of the AdSense blocks.
 You must select a format, a group, and a channel.</p>
 <p>Enable the block, and specify a region for it to be displayed in.</p>
@@ -77,7 +86,7 @@
   <li>slot: This is the slot ID provided by Google in the
   <a href="https://www.google.com/adsense/adslots">AdSense Managed Ads
   page</a>. Usually in the form 0123456789. Refer to the
-  <a href="adsense/cse"> Custom Search help</a> for instructions on how to
+  $custom_search_link for instructions on how to
   determine the slot ID for AdSense for Search.</li>
   <li>group: (old format only) This is the group that denotes the type (text
   or image) and color of the ad. This can be 1, 2 or 3. If not specified, then