Permalink
Browse files

Merge branch 'develop' of github.com:vanillaforums/Addons into develop

  • Loading branch information...
2 parents be91d8c + 7315f91 commit e12ad80edb911f3cb56a762314c983d8b16a1eda @linc linc committed May 7, 2012
@@ -154,7 +154,7 @@ public function ProfileController_BeforeProfileOptions_Handler($Sender) {
$UserIgnored = $this->Ignored($Sender->User->UserID);
$Label = ($UserIgnored) ? 'Unignore' : 'Ignore';
$Method = ($UserIgnored) ? 'unset' : 'set';
- echo ' '.Anchor(T($Label), "/user/ignore/toggle/{$Sender->User->UserID}/".Gdn_Format::Url($Sender->User->Name), 'Ignore Button').' ';
+ echo ' '.Anchor(T($Label), "/user/ignore/toggle/{$Sender->User->UserID}/".Gdn_Format::Url($Sender->User->Name), 'Ignore NavButton').' ';
}
}
@@ -221,6 +221,8 @@ protected function DrawSignature($Sender) {
$SourceUserID = GetValue('InsertUserID', $Data);
$Signature = $this->Signatures($Sender, $SourceUserID);
+ if (is_array($Signature))
+ list($Signature, $SigFormat) = $Signature;
$this->EventArguments = array(
'UserID' => $SourceUserID,
@@ -240,6 +240,8 @@ public function Base_ConnectData_Handler($Sender, $Args) {
$Form->SetFormValue('Name', GetValue('name', $JsData));
$Form->SetFormValue('Email', GetValue('email', $JsData));
$Form->SetFormValue('Photo', GetValue('photourl', $JsData, ''));
+ $Form->SetFormValue('Roles', GetValue('roles', $JsData, ''));
+
$Sender->SetData('Verified', TRUE);
}

0 comments on commit e12ad80

Please sign in to comment.