www/adium.im 372:c558ba50c516: Improved Mac OS X version detecti...

[commits at adium.im]

details:	http://hg.adium.im/www/adium.im/rev/c558ba50c516
revision:	372:c558ba50c516
author:		Evan Schoenberg
date:		Tue Jan 04 00:16:19 2011 -0600

Improved Mac OS X version detection; some user agent strings don't include the micro version

diffs (21 lines):

diff -r d1420f38644a -r c558ba50c516 index.php
--- a/index.php	Wed Dec 29 03:01:31 2010 +0100
+++ b/index.php	Tue Jan 04 00:16:19 2011 -0600
@@ -36,11 +36,13 @@
         $macOSXMajor = substr($macOSXMajor, 0, strpos($macOSXMajor, "_"));
         
         $macOSXMinor = substr($userAgent, strpos($userAgent, "Mac OS X ".$macOSXMajor."_") + strlen("Mac OS X ".$macOSXMajor."_"));
-        $macOSXMinor = substr($macOSXMinor, 0, strpos($macOSXMinor, "_"));
+        if (strpos($macOSXMinor, "_") !== false) {
+            $macOSXMinor = substr($macOSXMinor, 0, strpos($macOSXMinor, "_"));
 
-        $macOSXMicro = substr($userAgent, strpos($userAgent, "Mac OS X ".$macOSXMajor."_".$macOSXMinor."_") + strlen("Mac OS X ".$macOSXMajor."_".$macOSXMinor."_"));
-        $macOSXMicro = substr($macOSXMicro, 0, strpos($macOSXMicro, ";"));
-        
+            $macOSXMicro = substr($userAgent, strpos($userAgent, "Mac OS X ".$macOSXMajor."_".$macOSXMinor."_") + strlen("Mac OS X ".$macOSXMajor."_".$macOSXMinor."_"));
+            $macOSXMicro = substr($macOSXMicro, 0, strpos($macOSXMicro, ";"));
+        }
+
         $major = intval($macOSXMajor);
         $minor = intval($macOSXMinor);
         $micro = intval($macOSXMicro);