Revert PR #38552 (#38711)

laravel · Sep 8, 2021 · 408dc67 · 408dc67
1 parent 9e84430
commit 408dc67
Showing 1 changed file with 5 additions and 16 deletions.
diff --git a/src/Illuminate/Auth/Notifications/ResetPassword.php b/src/Illuminate/Auth/Notifications/ResetPassword.php
@@ -59,31 +59,20 @@ public function via($notifiable)
      */
     public function toMail($notifiable)
     {
-        $url = $this->resetUrl($notifiable);
-
         if (static::$toMailCallback) {
-            return call_user_func(static::$toMailCallback, $notifiable, $this->token, $url);
+            return call_user_func(static::$toMailCallback, $notifiable, $this->token);
         }
 
-        return $this->buildMailMessage($url);
-    }
-
-    /**
-     * Get the password reset URL for the given notifiable.
-     *
-     * @param  mixed  $notifiable
-     * @return string
-     */
-    protected function resetUrl($notifiable)
-    {
         if (static::$createUrlCallback) {
-            return call_user_func(static::$createUrlCallback, $notifiable, $this->token);
+            $url = call_user_func(static::$createUrlCallback, $notifiable, $this->token);
         } else {
-            return url(route('password.reset', [
+            $url = url(route('password.reset', [
                 'token' => $this->token,
                 'email' => $notifiable->getEmailForPasswordReset(),
             ], false));
         }
+
+        return $this->buildMailMessage($url);
     }
 
     /**