Browse Source

Do not calculate the normalized email for guest posts

Visman 5 years ago
parent
commit
4909bd7b02
2 changed files with 6 additions and 3 deletions
  1. 5 2
      app/Models/Post/Model.php
  2. 1 1
      app/Models/User/Model.php

+ 5 - 2
app/Models/Post/Model.php

@@ -49,8 +49,11 @@ class Model extends DataModel
             throw new RuntimeException('No user data in post number ' . $this->id);
         } elseif (1 === $this->poster_id) {
             $user = clone $user;
-            $user->__email = $this->poster_email;
-            $user->__username = $this->poster;
+
+            $user->setAttr('email_normal', false); // заблокировать вычисление в модели User
+
+            $user->__email        = $this->poster_email;
+            $user->__username     = $this->poster;
         }
 
         return $user;

+ 1 - 1
app/Models/User/Model.php

@@ -396,7 +396,7 @@ class Model extends DataModel
     {
         $this->setAttr('email', $email);
 
-        if ('' == $email) {
+        if (empty($email) || false === $this->getAttr('email_normal')) {
             return;
         }