Merge branch 'dev' into openiddict-template-integrate

README.md

@@ -7,6 +7,8 @@
 [![MyGet (nightly builds)](https://img.shields.io/myget/abp-nightly/vpre/Volo.Abp.svg?style=flat-square)](https://docs.abp.io/en/abp/latest/Nightly-Builds)
 [![NuGet Download](https://img.shields.io/nuget/dt/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core)
 
+[![ABP Discord server](https://img.shields.io/discord/951497912645476422?label=Discord)](https://discord.gg/abp)
+
 ABP Framework is a complete **infrastructure** based on the **ASP.NET Core** to create **modern web applications** and **APIs** by following the software development **best practices** and the **latest technologies**. Check out https://abp.io
 
 ## Getting Started

docs/en/docs-nav.json

@@ -1333,6 +1333,19 @@
         }
       ]
     },
+    {
+      "text": "Books",
+      "items": [
+        {
+          "text": "Mastering ABP Framework",
+          "path": "https://abp.io/books/mastering-abp-framework"
+        },
+        {
+          "text": "Implementing Domain Driven Design",
+          "path": "https://abp.io/books/implementing-domain-driven-design"
+        }
+      ]
+    },
     {
       "text": "Release Information",
       "items": [

modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs

@@ -34,11 +34,14 @@ public class ManageModel : AccountPageModel
             await contributor.ConfigureAsync(ProfileManagementPageCreationContext);
         }
 
-        if (!Url.IsLocalUrl(ReturnUrl) &&
-            !ReturnUrl.StartsWith(UriHelper.BuildAbsolute(Request.Scheme, Request.Host, Request.PathBase).RemovePostFix("/")) &&
-            !AppUrlProvider.IsRedirectAllowedUrl(ReturnUrl))
+        if (ReturnUrl != null)
         {
-            ReturnUrl = null;
+            if (!Url.IsLocalUrl(ReturnUrl) &&
+                !ReturnUrl.StartsWith(UriHelper.BuildAbsolute(Request.Scheme, Request.Host, Request.PathBase).RemovePostFix("/")) &&
+                !AppUrlProvider.IsRedirectAllowedUrl(ReturnUrl))
+            {
+                ReturnUrl = null;
+            }
         }
 
         return Page();