diff options
author | Sarven Capadisli <csarven@status.net> | 2010-02-19 14:22:25 +0100 |
---|---|---|
committer | Sarven Capadisli <csarven@status.net> | 2010-02-19 14:22:25 +0100 |
commit | 2c09702b2df4a6ede7fef4b7f1d7c1bcc77a4649 (patch) | |
tree | 29652d3e0839404eb864f575bf44ab75ae3a4fdc /plugins/OStatus/classes | |
parent | 8d59f7cc9d7f9f12d46530db2d9efe0b7aaac1a5 (diff) | |
parent | 52e8aa798a23b2832a748189b42c3bc77d65c9c7 (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus/classes')
-rw-r--r-- | plugins/OStatus/classes/Ostatus_profile.php | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 1ce8ac491..e0cb467e5 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -489,36 +489,6 @@ class Ostatus_profile extends Memcached_DataObject } /** - * Parse location given as a GeoRSS-simple point, if provided. - * http://www.georss.org/simple - * - * @param feed item $entry - * @return mixed Location or false - */ - function getLocation($dom) - { - $points = $dom->getElementsByTagNameNS('http://www.georss.org/georss', 'point'); - - for ($i = 0; $i < $points->length; $i++) { - $point = $points->item(0)->textContent; - $point = str_replace(',', ' ', $point); // per spec "treat commas as whitespace" - $point = preg_replace('/\s+/', ' ', $point); - $point = trim($point); - $coords = explode(' ', $point); - if (count($coords) == 2) { - list($lat, $lon) = $coords; - if (is_numeric($lat) && is_numeric($lon)) { - common_log(LOG_INFO, "Looking up location for $lat $lon from georss"); - return Location::fromLatLon($lat, $lon); - } - } - common_log(LOG_ERR, "Ignoring bogus georss:point value $point"); - } - - return false; - } - - /** * @param string $profile_url * @return Ostatus_profile * @throws FeedSubException @@ -560,7 +530,7 @@ class Ostatus_profile extends Memcached_DataObject // ripped from oauthstore.php (for old OMB client) $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar'); copy($url, $temp_filename); - + // @fixme should we be using different ids? $imagefile = new ImageFile($this->id, $temp_filename); $filename = Avatar::filename($this->id, |