merge r9054 from branch 2.1 to trunk

bug 2175 fixed: do not use the HTML prefetch feature with Google Chrome because it was sometimes making the photos impossible to show. git-svn-id: http://piwigo.org/svn/trunk@9055 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Feb 2, 2011 · 99f25fd · 99f25fd
1 parent 6ee66d8
commit 99f25fd
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/picture.php b/picture.php
@@ -647,7 +647,8 @@ function default_picture_content($content, $element_info)
 
 
 if (isset($picture['next']['image_url'])
-    and $picture['next']['is_picture'] )
+    and $picture['next']['is_picture']
+    and strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome/') === false)
 {
   $template->assign('U_PREFETCH', $picture['next']['image_url'] );
 }