Index: /sites/trunk/api.wordpress.org/public_html/events/1.0/index.php
===================================================================
--- /sites/trunk/api.wordpress.org/public_html/events/1.0/index.php (revision 5536)
+++ /sites/trunk/api.wordpress.org/public_html/events/1.0/index.php (revision 5537)
@@ -142,5 +142,7 @@
*
* @todo Update the user-agent strings if 40702-geoip.2.diff doesn't make it into beta2
- * @todo Remove this back-compat code after beta2 has been out for a few days
+ * @todo Remove this back-compat code after 4.8.0 has been out for a few days, to avoid
+ * impacting the feature plugin in 4.7 installs. rebuild_location_from_event_source()
+ * can probably be removed at that time too.
*/
$use_fuzzy_locations = false !== strpos( $_SERVER['HTTP_USER_AGENT'], '4.7' ) || false !== strpos( $_SERVER['HTTP_USER_AGENT'], '4.8-beta1' );
@@ -387,5 +389,5 @@
* @param string $dotted_ip
*
- * @return null|object `null` on failure; an object on success
+ * @return false|object `false` on failure; an object on success
*/
function guess_location_from_ip( $dotted_ip ) {
@@ -405,5 +407,5 @@
if ( false === $long_ip || ! isset( $from, $where ) ) {
- return;
+ return false;
}
@@ -419,5 +421,5 @@
// Unknown location:
if ( ! $row || '-' == $row->country_short ) {
- return;
+ return false;
}