Merge pull request #21 from brandonsavage/bug804293

Bug 804293 - Fixing a persistent notice that appears when GEOIP =
mozilla-services · Dec 27, 2012 · 0650c81 · 0650c81
2 parents 8a417a4 + 08c108b
commit 0650c81
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/bouncer/php/index.php b/bouncer/php/index.php
@@ -219,7 +219,8 @@ function setHttpType($ssl_only) {
                 os_id = %d", array($product_id, $os_id));
 
         $client_ip = null;
-
+        $fallback_global = FALSE; // False means we WILL fall back.
+
         // did we get a valid location?
         if (!empty($location)) {
             $mirrors = false;
@@ -304,11 +305,15 @@ function setHttpType($ssl_only) {
                                 array($where_lang, $location['id'], $client_region), MYSQL_ASSOC, 'id');
                         }
                 }
+
+
             }
 
             // If we're here we've fallen back to global
-            $fallback_global = getGlobalFallbackProhibited($client_region);
             if (empty($mirrors) && !$fallback_global) {
+                if (GEOIP) {
+                    $fallback_global = getGlobalFallbackProhibited($client_region);
+                }
                 // either no region chosen or no mirror found in the given region
                 $http_type = setHttpType($ssl_only);
                 $mirrors = $sdo->get("