diff --git a/template.php b/template.php index 13c544f..579f755 100644 --- a/template.php +++ b/template.php @@ -379,7 +379,7 @@ function section_class($page, $onefour=true){ } else { $cols = (bool) $page['user5'] + (bool) $page['user6'] + (bool) $page['user7'] + (bool) $page['user8']; } - if((theme_get_setting('grid_responsive') == '1') && ((preg_match('/(?i)msie [2-7]/',$_SERVER['HTTP_USER_AGENT']))) == FALSE) { + if((theme_get_setting('grid_responsive') == '1') && !zeropoint_browser_is_ie()) { if ($cols == '1') { return 'pure-u-1'; } @@ -399,7 +399,7 @@ function section_class($page, $onefour=true){ function first_class(){ $w1 = (theme_get_setting('first_width')); - if((theme_get_setting('grid_responsive') == '1') && ((preg_match('/(?i)msie [2-7]/',$_SERVER['HTTP_USER_AGENT']))) == FALSE) { + if ((theme_get_setting('grid_responsive') == '1') && !zeropoint_browser_is_ie()) { return 'pure-u-1 pure-u-md-'.$w1.'-24'; } else { return 'pure-u-'.$w1.'-24'; @@ -408,7 +408,7 @@ function first_class(){ function second_class(){ $w2 = (theme_get_setting('second_width')); - if((theme_get_setting('grid_responsive') == '1') && ((preg_match('/(?i)msie [2-7]/',$_SERVER['HTTP_USER_AGENT']))) == FALSE) { + if ((theme_get_setting('grid_responsive') == '1') && !zeropoint_browser_is_ie()) { return 'pure-u-1 pure-u-md-'.$w2.'-24'; } else { return 'pure-u-'.$w2.'-24'; @@ -423,27 +423,27 @@ function cont_class($page){ $cont2 = 24 - $w2; $cont0 = 24 - ($w1+$w2); if (($page['sidebar_first']) && (!$page['sidebar_second'])) { - if((theme_get_setting('grid_responsive') == '1') && ((preg_match('/(?i)msie [2-7]/',$_SERVER['HTTP_USER_AGENT']))) == FALSE) { + if ((theme_get_setting('grid_responsive') == '1') && !zeropoint_browser_is_ie()) { return 'pure-u-1 pure-u-md-'.$cont1.'-24'; } else { return 'pure-u-'.$cont1.'-24'; } } if ((!$page['sidebar_first']) && ($page['sidebar_second'])) { - if((theme_get_setting('grid_responsive') == '1') && ((preg_match('/(?i)msie [2-7]/',$_SERVER['HTTP_USER_AGENT']))) == FALSE) { + if ((theme_get_setting('grid_responsive') == '1') && !zeropoint_browser_is_ie()) { return 'pure-u-1 pure-u-md-'.$cont2.'-24'; } else { return 'pure-u-'.$cont2.'-24'; } } if (($page['sidebar_first']) && ($page['sidebar_second'])) { - if((theme_get_setting('grid_responsive') == '1') && ((preg_match('/(?i)msie [2-7]/',$_SERVER['HTTP_USER_AGENT']))) == FALSE) { + if ((theme_get_setting('grid_responsive') == '1') && !zeropoint_browser_is_ie()) { return 'pure-u-1 pure-u-md-'.$cont0.'-24'; } else { return 'pure-u-'.$cont0.'-24'; } } else { - if((theme_get_setting('grid_responsive') == '1') && ((preg_match('/(?i)msie [2-7]/',$_SERVER['HTTP_USER_AGENT']))) == FALSE) { + if ((theme_get_setting('grid_responsive') == '1') && !zeropoint_browser_is_ie()) { return 'pure-u-1 pure-u-md-24-24'; } else { return 'pure-u-24-24'; @@ -666,3 +666,13 @@ function zeropoint_css_alter(&$css) { ); $css = array_diff_key($css, $exclude); } + +/** + * Detects Internet Explorer Zeropoint style. + * + * @return TRUE|FALSE + */ +function zeropoint_browser_is_ie() { + // Case insensitive match of MSIE versions 2 through 7. + return !empty($_SERVER['HTTP_USER_AGENT']) && preg_match('/(?i)msie [2-7]/', $_SERVER['HTTP_USER_AGENT']); +}