Changeset 1584

Timestamp:

09/03/2004 04:29:11 AM (21 years ago)

Author:

rboren

Message:

Send Geo Url Header only if use_geo_positions is set. Bug 242. Patch from 2fargon.

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -835 +835 @@
     global $posts;
 
-    if ($posts && 1 === count($posts) && ! empty($posts[0]->post_lat)) {
-        // there's only one result  see if it has a geo code
-        $row = $posts[0];
-        $lat = $row->post_lat;
-        $lon = $row->post_lon;
-        $title = $row->post_title;
-        if(($lon != null) && ($lat != null) ) {
-            echo "<meta name=\"ICBM\" content=\"".$lat.", ".$lon."\" />\n";
-            echo "<meta name=\"DC.title\" content=\"".convert_chars(strip_tags(htmlspecialchars(get_bloginfo("name"))))." - ".$title."\" />\n";
-            echo "<meta name=\"geo.position\" content=\"".$lat.";".$lon."\" />\n";
-            return;
-        }
-    } else {
-        if(get_settings('use_default_geourl')) {
-            // send the default here 
-            echo "<meta name='ICBM' content=\"". get_settings('default_geourl_lat') .", ". get_settings('default_geourl_lon') ."\" />\n";
-            echo "<meta name='DC.title' content=\"".convert_chars(strip_tags(htmlspecialchars(get_bloginfo("name"))))."\" />\n";
-            echo "<meta name='geo.position' content=\"". get_settings('default_geourl_lat') .";". get_settings('default_geourl_lon') ."\" />\n";
-        }
-    }
+  if (get_settings('use_geo_positions')) {
+        if ($posts && 1 === count($posts) && ! empty($posts[0]->post_lat)) {
+            // there's only one result  see if it has a geo code
+            $row = $posts[0];
+            $lat = $row->post_lat;
+            $lon = $row->post_lon;
+            $title = $row->post_title;
+            if(($lon != null) && ($lat != null) ) {
+                echo "<meta name=\"ICBM\" content=\"".$lat.", ".$lon."\" />\n";
+                echo "<meta name=\"DC.title\" content=\"".convert_chars(strip_tags(htmlspecialchars(get_bloginfo("name"))))." - ".$title."\" />\n";
+                echo "<meta name=\"geo.position\" content=\"".$lat.";".$lon."\" />\n";
+                return;
+            }
+        } else {
+            if(get_settings('use_default_geourl')) {
+                // send the default here 
+                echo "<meta name='ICBM' content=\"". get_settings('default_geourl_lat') .", ". get_settings('default_geourl_lon') ."\" />\n";
+                echo "<meta name='DC.title' content=\"".convert_chars(strip_tags(htmlspecialchars(get_bloginfo("name"))))."\" />\n";
+                echo "<meta name='geo.position' content=\"". get_settings('default_geourl_lat') .";". get_settings('default_geourl_lon') ."\" />\n";
+            }
+        }
+    }
 }