Skip to content

Commit 3088a7a

Browse files
Fix test for chrome version 7 by not including periods. We only care about the major and php is confused.
1 parent f6f35c7 commit 3088a7a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

web/includes/functions.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,8 @@ function getBrowser(&$browser, &$version) {
678678
) {
679679
$version = $logVersion[1];
680680
$browser = 'ie';
681-
} else if ( preg_match('/Chrome\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
681+
} else if ( preg_match('/Chrome\/([0-9]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
682+
// We only care about the major so don't count .
682683
$version = $logVersion[1];
683684
// Check for old version of Chrome with bug 5876
684685
if ( $version < 7 ) {
@@ -758,6 +759,7 @@ function canStreamIframe() {
758759
}
759760

760761
function canStreamNative() {
762+
ZM\Debug("ZM_WEB_CAN_STREAM:".ZM_WEB_CAN_STREAM.' isInternetExplorer: ' . isInternetExplorer() . ' isOldChrome:' . isOldChrome());
761763
// Old versions of Chrome can display the stream, but then it blocks everything else (Chrome bug 5876)
762764
return ( ZM_WEB_CAN_STREAM == 'yes' || ( ZM_WEB_CAN_STREAM == 'auto' && (!isInternetExplorer() && !isOldChrome()) ) );
763765
}

0 commit comments

Comments
 (0)