From 2e8b7295037f0d45c973762c6d1993bc5abd4e4c Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Fri, 10 Aug 2012 19:52:14 +0200 Subject: [PATCH] Issue 3636 request clarity for users without validated emails on instances with RequireValidatedEmail active --- .../RequireValidatedEmailPlugin.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php index c14ace1f1e..8cf57c57cd 100644 --- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php +++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php @@ -240,18 +240,20 @@ class RequireValidatedEmailPlugin extends Plugin } /** - * Hide the notice form if the user isn't able to post. + * Show an error message about validating user email before posting * + * @param string $tag Current tab tag value * @param Action $action action being shown + * @param Form $form object producing the form * * @return boolean hook value */ - function onStartShowNoticeForm($action) + function onStartMakeEntryForm($tag, $action, &$form) { $user = common_current_user(); - if (!empty($user)) { // it's a remote notice + if (!empty($user)) { if (!$this->validated($user)) { - return false; + $action->element('div', array('class'=>'error'), _('You must validate an email address before posting!')); } } return true; -- 2.39.2