Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 2 insertions, 0 deletions

diff --git a/mod/rmagic.php b/mod/rmagic.php
index 49525bd32..597c6ed9c 100644
--- a/mod/rmagic.php
+++ b/mod/rmagic.php
@@ -33,6 +33,8 @@ function rmagic_post(&$a) {
 			$openid = new LightOpenID(z_root());
 			$openid->identity = $address;
 			$openid->returnUrl = z_root() . '/openid'; 
+			$openid->required = array('namePerson/friendly', 'namePerson');
+			$openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
 			goaway($openid->authUrl());
 		} catch (Exception $e) {
 			notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'. t('The error message was:').' '.$e->getMessage());