Index: click_heatmap.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/click_heatmap/click_heatmap.module,v
retrieving revision 1.5.4.16
diff -u -r1.5.4.16 click_heatmap.module
--- click_heatmap.module	28 Sep 2009 07:32:47 -0000	1.5.4.16
+++ click_heatmap.module	28 Sep 2009 07:40:17 -0000
@@ -84,15 +84,18 @@
  */
 function click_heatmap_display() {
   if (user_access('count click_heatmap clicks')) {
+    $url = click_heatmap_get_url();
     switch (variable_get('click_heatmap_scope', 'home')) {
       case 'all':
         return TRUE;
       case 'user':
-        return (strpos(substr(click_heatmap_get_url(), 0, 5), 'admin') === FALSE);
+        return (strpos(substr($url, 0, 5), 'admin') === FALSE) &&
+               (strpos($url, 'node/edit') === FALSE && strpos($url, 'node/add') === FALSE);
       case 'admin':
-        return (strpos(substr(click_heatmap_get_url(), 0, 5), 'admin') !== FALSE);
+        return (strpos(substr($url, 0, 5), 'admin') !== FALSE) ||
+               (strpos($url, 'node/edit') !== FALSE || strpos($url, 'node/add') !== FALSE);
       case 'home':
-        return (click_heatmap_get_url() == 'home');
+        return ($url == 'home');
     }
   }
   return FALSE;
Index: CHANGELOG.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/click_heatmap/Attic/CHANGELOG.txt,v
retrieving revision 1.1.2.11
diff -u -r1.1.2.11 CHANGELOG.txt
--- CHANGELOG.txt	28 Sep 2009 07:32:47 -0000	1.1.2.11
+++ CHANGELOG.txt	28 Sep 2009 07:40:17 -0000
@@ -13,5 +13,6 @@
    * Remove old form argument from log view.
    * #504504: Hide admin_menu when viewing click heatmaps.
    * #397424 : Add permission for counting clicks.
+   * #397076: "Non-admin pages" should also exclude /node/edit and /node/add.
 - Bugs:
    * #291573 by wulff and univate: Fatal error: Call to undefined function language_initialize().