Merge remote branch 'origin/master' into xnet_accounts

[platal.git] / modules / profile / general.inc.php

diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php
index c89c11c..817b9a9 100644 (file)
--- a/modules/profile/general.inc.php
+++ b/modules/profile/general.inc.php
@@ -558,9 +558,6 @@ class ProfileSettingGeneral extends ProfilePage
                         LEFT JOIN  profile_phones        AS pp ON (pp.pid = p.pid AND link_type = 'user')
                             WHERE  p.pid = {?}", $this->pid());
         $this->values = $res->fetchOneAssoc();
-        if ($this->owner) {
-            $this->values['yourself'] = $this->owner->displayName();
-        }
 
         // Retreive photo informations
         $res = XDB::query("SELECT  pub
@@ -665,7 +662,7 @@ class ProfileSettingGeneral extends ProfilePage
         $page->assign('edu_fields', $res->fetchAllAssoc());
 
         require_once "emails.combobox.inc.php";
-        fill_email_combobox($page, $this->owner, $this->profile);
+        fill_email_combobox($page, $this->owner);
 
         $res = XDB::query("SELECT  nw.nwid AS type, nw.name
                              FROM  profile_networking_enum AS nw