Index: googleanalytics.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/google_analytics/googleanalytics.admin.inc,v
retrieving revision 1.24.2.29
diff -u -r1.24.2.29 googleanalytics.admin.inc
--- googleanalytics.admin.inc	12 Feb 2011 15:11:18 -0000	1.24.2.29
+++ googleanalytics.admin.inc	18 Feb 2011 19:31:53 -0000
@@ -249,7 +249,7 @@
   $form['tracking']['privacy']['googleanalytics_privacy_donottrack'] = array(
     '#type' => 'checkbox',
     '#title' => t('Universal web tracking opt-out'),
-    '#description' => t('If enabled and your server receives the <a href="http://donottrack.us/">Do-Not-Track</a> header from the client browser, the Google Analytics module will not embed any tracking code into your website. Compliance with Do Not Track could be purely voluntary, enforced by industry self-regulation, or mandated by state or federal law. Please accept your visitors privacy. If they have opt-out from tracking and advertising, you should accept their personal decision.'),
+    '#description' => t('If enabled and your server receives the <a href="http://donottrack.us/">Do-Not-Track</a> header from the client browser, the Google Analytics module will not embed any tracking code into your site. Compliance with Do Not Track could be purely voluntary, enforced by industry self-regulation, or mandated by state or federal law. Please accept your visitors privacy. If they have opt-out from tracking and advertising, you should accept their personal decision. This feature is currently limited to logged in users and disabled page caching.'),
     '#default_value' => variable_get('googleanalytics_privacy_donottrack', 1),
   );
 
Index: googleanalytics.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/google_analytics/googleanalytics.module,v
retrieving revision 1.70.2.14
diff -u -r1.70.2.14 googleanalytics.module
--- googleanalytics.module	12 Feb 2011 15:11:18 -0000	1.70.2.14
+++ googleanalytics.module	18 Feb 2011 19:31:54 -0000
@@ -452,8 +452,9 @@
 
   $enabled = FALSE;
 
-  // Disable tracking for visitors who have opted out from tracking via DNT (Do-Not-Track) header.
-  $dnt = (variable_get('googleanalytics_privacy_donottrack', 1) && !empty($_SERVER['HTTP_DNT'])) ? TRUE : FALSE;
+  // Disable tracking if caching is disabled or a visitors is logged in and
+  // have opted out from tracking via DNT (Do-Not-Track) header.
+  $dnt = (($account->uid > 0 || empty(variable_get('googleanalytics_cache', 0)) && variable_get('googleanalytics_privacy_donottrack', 1) && !empty($_SERVER['HTTP_DNT'])) ? TRUE : FALSE;
 
   // Is current user a member of a role that should be tracked?
   if (!$dnt && _googleanalytics_visibility_roles($account)) {