Przeglądaj źródła

! wrong order in browser detection was causing mis-identification

Spuds 12 lat temu
rodzic
commit
18d18f465d
1 zmienionych plików z 25 dodań i 25 usunięć
  1. 25 25
      Sources/Load.php

+ 25 - 25
Sources/Load.php

@@ -1231,32 +1231,8 @@ function detectBrowser()
 {
 	global $context, $user_info;
 	
-	// Always have these available in $context to support mods that don't use isBrowser
-	$context['browser'] = array(
-		'is_opera6' => false,
-		'is_opera7' => false,
-		'is_opera8' => false,
-		'is_opera9' => false,
-		'is_opera10' => false,
-		'is_ie4' => false,
-		'is_mac_ie' => false,
-		'is_firefox1' => false,
-		'is_firefox2' => false,
-		'is_firefox3' => false,
-		'is_iphone' => false,
-		'is_android' => false,
-		'is_chrome' => false,
-		'is_safari' => false,
-		'is_ie8' => false,
-		'is_ie7' => false,
-		'is_ie6' => false,
-		'is_ie5.5' => false,
-		'is_ie5' => false,
-		'ie_standards_fix' => false,
-	);
-
 	// The following determines the user agent (browser) as best it can.
-	$context['browser'] += array(
+	$context['browser'] = array(
 		'is_opera' => strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false,
 		'is_webkit' => strpos($_SERVER['HTTP_USER_AGENT'], 'AppleWebKit') !== false,
 		'is_firefox' => preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $_SERVER['HTTP_USER_AGENT']) === 1,
@@ -1340,6 +1316,30 @@ function detectBrowser()
 	}
 	else
 		$context['browser']['possibly_robot'] = false;
+
+	// Fill out the rest as needed to support mods that don't use isBrowser
+	$context['browser'] += array(
+		'is_opera6' => false,
+		'is_opera7' => false,
+		'is_opera8' => false,
+		'is_opera9' => false,
+		'is_opera10' => false,
+		'is_ie4' => false,
+		'is_mac_ie' => false,
+		'is_firefox1' => false,
+		'is_firefox2' => false,
+		'is_firefox3' => false,
+		'is_iphone' => false,
+		'is_android' => false,
+		'is_chrome' => false,
+		'is_safari' => false,
+		'is_ie8' => false,
+		'is_ie7' => false,
+		'is_ie6' => false,
+		'is_ie5.5' => false,
+		'is_ie5' => false,
+		'ie_standards_fix' => false,
+	);
 }
 
 /**