Changeset 17346

Timestamp:

08/03/12 11:55:51 (10 months ago)

Author:

mistic100

Message:

Merged revision(s) r17345 from trunk:
bug 2715: on picture page, tools buttons + Firefox prefetch increment the hit counter

Files:

• branches/2.4/picture.php (modified) (2 diffs)

branches/2.4/picture.php

@@ -423 +423 @@
 }
 
-//---------- incrementation of the number of hits, we do this only if no action
+
+//---------- incrementation of the number of hits
+// don't increment counter if in the Mozilla Firefox prefetch
+if (isset($_SERVER['HTTP_X_MOZ']) and $_SERVER['HTTP_X_MOZ'] == 'prefetch')
+{
+  add_event_handler('allow_increment_element_hit_count', create_function('$b', 'return false;'));
+}
+else
+{
+  // don't increment counter if comming from the same picture (actions)
+  if (pwg_get_session_var('referer_image_id',0) == $page['image_id'])
+  {
+    add_event_handler('allow_increment_element_hit_count', create_function('$b', 'return false;'));
+  }
+  pwg_set_session_var('referer_image_id', $page['image_id']);
+}
+
+// don't increment if adding a comment
 if (trigger_event('allow_increment_element_hit_count', !isset($_POST['content']) ) )
 {
@@ -434 +451 @@
   pwg_query($query);
 }
+
 //---------------------------------------------------------- related categories
 $query = '