aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-02-02 11:39:17 +0000
committerplegall <plg@piwigo.org>2011-02-02 11:39:17 +0000
commit99f25fdb32e801155b74abfa060288ee38346247 (patch)
treefaeb2179c08d7128b172bd5c71d8b70b97c3a29f
parent6ee66d829b5508e4f9a98e33164d32aedfeb9ec9 (diff)
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
-rw-r--r--picture.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/picture.php b/picture.php
index 66bef5d4c..becfb6dde 100644
--- a/picture.php
+++ b/picture.php
@@ -647,7 +647,8 @@ $picture = trigger_event('picture_pictures_data', $picture);
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'] );
}