Skip to content
Snippets Groups Projects
Commit 3dda36b5 authored by Demian Katz's avatar Demian Katz
Browse files

Rolled back changes that conflicted with createEmailViewModel().

parent 59e9b56c
No related merge requests found
......@@ -355,9 +355,8 @@ class AbstractRecord extends AbstractBase
{
// Force login if necessary:
$config = $this->getConfig();
$user = $this->getUser();
if ((!isset($config->Mail->require_login) || $config->Mail->require_login)
&& !$user
&& !$this->getUser()
) {
return $this->forceLogin();
}
......@@ -391,9 +390,6 @@ class AbstractRecord extends AbstractBase
// Display the template:
$view->setTemplate('record/email');
if ($user) {
$view->from = $user->email;
}
return $view;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment