wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brion Vibber 2011-03-16 11:12:29 -07:00
commit d1c778b439
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
plugins/ExtendedProfile/extendedprofilewidget.php
View File

@ -395,25 +395,28 @@ class ExtendedProfileWidget extends Form
{ {
$this->out->elementStart('div', 'education-item'); $this->out->elementStart('div', 'education-item');
$this->out->element('div', 'label', _m('Institution')); $this->out->element('div', 'label', _m('Institution'));
$this->out->element('div', 'field', $field['school']); if (!empty($field['school'])) {
$this->out->element('div', 'label', _m('Degree'));
$this->out->element('div', 'field', $field['degree']); $this->out->element('div', 'field', $field['school']);
$this->out->element('div', 'label', _m('Description')); $this->out->element('div', 'label', _m('Degree'));
$this->out->element('div', 'field', $field['description']); $this->out->element('div', 'field', $field['degree']);
$this->out->element('div', 'label', _m('Start')); $this->out->element('div', 'label', _m('Description'));
$this->out->element( $this->out->element('div', 'field', $field['description']);
'div', $this->out->element('div', 'label', _m('Start'));
array('class' => 'field date'), $this->out->element(
date('j M Y', strtotime($field['start']) 'div',
) array('class' => 'field date'),
); date('j M Y', strtotime($field['start'])
$this->out->element('div', 'label', _m('End')); )
$this->out->element( );
'div', $this->out->element('div', 'label', _m('End'));
array('class' => 'field date'), $this->out->element(
date('j M Y', strtotime($field['end']) 'div',
) array('class' => 'field date'),
); date('j M Y', strtotime($field['end'])
)
);
}
$this->out->elementEnd('div'); $this->out->elementEnd('div');
} }
@ -564,10 +567,11 @@ class ExtendedProfileWidget extends Form
$out->input($id, null, $this->ext->getTextValue($name)); $out->input($id, null, $this->ext->getTextValue($name));
break; break;
case 'date': case 'date':
$value = $this->ext->getDateValue($name);
$out->input( $out->input(
$id, $id,
null, null,
date('j M Y', strtotime($this->ext->getDateValue($name))) empty($value) ? null : date('j M Y', strtotime($value))
); );
break; break;
case 'person': case 'person':

3
plugins/ExtendedProfile/profiledetailsettingsaction.php
View File

@ -260,8 +260,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
$this->removeAll($user, 'website'); $this->removeAll($user, 'website');
$i = 0; $i = 0;
foreach($sites as $site) { foreach($sites as $site) {
if (!empty($site['value']) && !Validate::uri(
if (!Validate::uri(
$site['value'], $site['value'],
array('allowed_schemes' => array('http', 'https'))) array('allowed_schemes' => array('http', 'https')))
) { ) {