Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	lib/language.php
	plugins/OpenID/finishaddopenid.php

1 files changed, 7 insertions, 4 deletions

diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php
index 4dc924695..68851f4eb 100644
--- a/plugins/OpenID/openid.php
+++ b/plugins/OpenID/openid.php
@@ -230,11 +230,14 @@ function _oid_print_instructions()
                       'OpenID provider.'));
 }
 
-# update a user from sreg parameters
-
-function oid_update_user(&$user, &$sreg)
+/**
+ * Update a user from sreg parameters
+ * @param User $user
+ * @param array $sreg fields from OpenID sreg response
+ * @access private
+ */
+function oid_update_user($user, $sreg)
 {
-
     $profile = $user->getProfile();
 
     $orig_profile = clone($profile);