summaryrefslogtreecommitdiff
path: root/classes/User.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-11-01 13:04:23 -0500
committerEvan Prodromou <evan@status.net>2009-11-01 13:04:23 -0500
commit5f5413624d166a9b2116d266c7698dd6dcd2d8c4 (patch)
tree3f7f85bbfb747d68bf518df026eea6ac686ad0c0 /classes/User.php
parent658683e240ef6e44c6450a16448fe7cb82f792f2 (diff)
parent44ce8e2fcd1eba0d0f2723c246c1a021614e2763 (diff)
Merge branch '0.9.x' into userflag
Diffstat (limited to 'classes/User.php')
-rw-r--r--classes/User.php10
1 files changed, 10 insertions, 0 deletions
diff --git a/classes/User.php b/classes/User.php
index 0a70c9801..3fa9cc152 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -198,6 +198,15 @@ class User extends Memcached_DataObject
}
if (!empty($location)) {
$profile->location = $location;
+
+ $loc = Location::fromName($location);
+
+ if (!empty($loc)) {
+ $profile->lat = $loc->lat;
+ $profile->lon = $loc->lon;
+ $profile->location_id = $loc->location_id;
+ $profile->location_ns = $loc->location_ns;
+ }
}
$profile->created = common_sql_now();
@@ -319,6 +328,7 @@ class User extends Memcached_DataObject
common_config('site', 'name'),
$user->nickname),
'system');
+ common_broadcast_notice($notice);
}
}